| commit | c0071dc977b4c049feed6544bf927190f42c627f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Nov 19 19:36:27 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 19 19:36:27 2014 +0000 |
| tree | 22baf7f91994cbf8c57fa6a75f6e683fe13fcbb8 | |
| parent | 41ae403fa0b161c808849165cf4e238a9912ccff [diff] | |
| parent | d15068d15a2acdbcc25900f1684eb8b48a996627 [diff] |
am d15068d1: (-s ours) am 328483aa: (-s ours) am 36d2656f: (-s ours) Import translations. DO NOT MERGE * commit 'd15068d15a2acdbcc25900f1684eb8b48a996627': Import translations. DO NOT MERGE