| commit | 5b5aee9747f2c1098639fadce19a8228e7eb58df | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri May 29 19:19:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 29 19:19:14 2015 +0000 |
| tree | 5d01fe8f3898c81c15d743f156fadef6f348c1b0 | |
| parent | 9a24ba99156a316b8dd62e5e5d0a453fd30362dd [diff] | |
| parent | 5276b90ead7842dd2ba17e567d8f7ff89378bd80 [diff] |
am 5276b90e: (-s ours) Import translations. DO NOT MERGE * commit '5276b90ead7842dd2ba17e567d8f7ff89378bd80': Import translations. DO NOT MERGE