| commit | bec73e0040ea842e297d3c8d9e09dafeff1dce68 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu May 14 18:05:21 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 14 18:05:21 2015 +0000 |
| tree | fad168ee1f28beb3125f3e68c9d13847e58bc46d | |
| parent | 2501dab3baf1c1dd646b04edaffe07880b493964 [diff] | |
| parent | 700b0d75490c51638493bcf2a7dd574f0863c8c3 [diff] |
am 700b0d75: (-s ours) am dde4f684: (-s ours) am 28791f9d: (-s ours) Import translations. DO NOT MERGE * commit '700b0d75490c51638493bcf2a7dd574f0863c8c3': Import translations. DO NOT MERGE