| commit | 9867cbe748d6fcb782cbf8a0a5ed4ff425b0370e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Oct 07 00:19:26 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 07 00:19:26 2014 +0000 |
| tree | df4827b701e3295c2379c36a8d859f130f895544 | |
| parent | 3c172e39f3a9caf666d842f662e1529d02b551ba [diff] | |
| parent | 6ccf3681365a4bfb5302a20cb8437cd4735e81a9 [diff] |
am 6ccf3681: (-s ours) am dec34b5f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '6ccf3681365a4bfb5302a20cb8437cd4735e81a9': Import translations. DO NOT MERGE