| commit | 3e5b8b35206aa724942af86d0a968535497a1c1a | [log] [tgz] |
|---|---|---|
| author | satok <satok@google.com> | Mon May 24 15:02:28 2010 +0900 |
| committer | satok <satok@google.com> | Mon May 24 15:02:28 2010 +0900 |
| tree | 4def50174106b8c801a44bbf2893f4fcfea578cb | |
| parent | 107d9dd5c01e727eaae62195e94128722fc05afc [diff] | |
| parent | db8dcd8b024202a131f5ebbf2b685972b044dda1 [diff] |
Merge commit 'goog/master' Conflicts: java/res/values-de/strings.xml java/res/values-it/strings.xml