commit | 217aebd32d709571d4fb765d498bb90ab23a9b53 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Fri Jul 24 03:26:34 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 24 03:26:34 2015 +0000 |
tree | 17f8f9ac3881e00aad5c2d63bb552708e181ed05 | |
parent | 03fe71ed0067a1c6937569ade4c583a914034173 [diff] | |
parent | 13cd0b25734e215f3369b0c5367dafdc74c070da [diff] |
am 13cd0b25: (-s ours) am f305e853: (-s ours) am 5376d54e: (-s ours) Import translations. DO NOT MERGE * commit '13cd0b25734e215f3369b0c5367dafdc74c070da': Import translations. DO NOT MERGE