| commit | 94127464b460b65ca6689e1c5156789decca8488 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 12 14:34:53 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 12 14:34:53 2015 +0000 |
| tree | 7310672ce128663688043906a1ffad7d9db6e2c3 | |
| parent | e1ffb406edd5f7bc224669a2f544fad26aff1d31 [diff] | |
| parent | 99ec3595002f98e4c67a8c23e8ef33590e460235 [diff] |
am 99ec3595: (-s ours) am ef2f6596: (-s ours) am ac3b53a7: (-s ours) Import translations. DO NOT MERGE * commit '99ec3595002f98e4c67a8c23e8ef33590e460235': Import translations. DO NOT MERGE