| commit | 52130fa63913fa8917aaf6ba795aabe7496a0359 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu May 14 06:38:55 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 14 06:38:55 2015 +0000 |
| tree | 98da127854e10ed2aeb8fed1f946342e2088e853 | |
| parent | d2b4e390f3b30ba663f4512f3a325e7ed62841ea [diff] | |
| parent | 9d14f3077a4949e6bde663d3830ac85101177443 [diff] |
am 9d14f307: (-s ours) am 5f75547d: (-s ours) Import translations. DO NOT MERGE * commit '9d14f3077a4949e6bde663d3830ac85101177443': Import translations. DO NOT MERGE