| commit | f7c1e071eed57ff3a49c5900e71b39dfa0480502 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 13 13:26:45 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 13 13:26:45 2014 +0000 |
| tree | 9d9e5bc445cbf3999397f7f8a1528458ec2f3380 | |
| parent | f2d2f3b95451420fb982925a3c03ed5337c8a911 [diff] | |
| parent | 1f699757b41408eddf6102b0dbabe0b08f7ac093 [diff] |
am 1f699757: (-s ours) Import translations. DO NOT MERGE * commit '1f699757b41408eddf6102b0dbabe0b08f7ac093': Import translations. DO NOT MERGE