| commit | 1bb57890a25e895f9b27ef557ca6a2f83dee8812 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 20 13:41:54 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 20 13:41:54 2015 +0000 |
| tree | 999ec56c09b7f188e75f6dcb40b3b779a0cb60f2 | |
| parent | d6807667ed2e95d5d28dd7a63b8a13ebf2a7a2e0 [diff] | |
| parent | 8eae506819b40370f2b1a55f7d72dec26e2c9410 [diff] |
am 8eae5068: (-s ours) am 69a7483e: (-s ours) Import translations. DO NOT MERGE * commit '8eae506819b40370f2b1a55f7d72dec26e2c9410': Import translations. DO NOT MERGE