| commit | ede11beb9c3a05dad2628809641c16398e3fbeb0 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 14:14:54 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 14:14:54 2015 +0000 |
| tree | 1a2f9f69674820540d354e52e905eeb43d03713d | |
| parent | 5449f0fdc0fe0eceb106e4d4554cdfe729103f84 [diff] | |
| parent | 34663b0fd4a21a6c107c6df313bcbd1548235fd5 [diff] |
am 34663b0f: (-s ours) am 36c35f23: (-s ours) Import translations. DO NOT MERGE * commit '34663b0fd4a21a6c107c6df313bcbd1548235fd5': Import translations. DO NOT MERGE