commit | 983dcbd1f858f9bbb5a9781bc9780ece834d70e3 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:17:29 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:17:29 2015 +0000 |
tree | 156318d1e7602a679e0bb7d9834512a17995ea14 | |
parent | 16b9a0ba09380f2c176068005cb28eb1e1d5dbac [diff] | |
parent | cc34158af0bf5318a33d74fed3e01de32a62149a [diff] |
am cc34158a: (-s ours) am 16ad0293: (-s ours) am 285c9d82: (-s ours) Import translations. DO NOT MERGE * commit 'cc34158af0bf5318a33d74fed3e01de32a62149a': Import translations. DO NOT MERGE