| commit | e2ace6eaf53eceb46dab2408e65432a10c7cc618 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jun 17 14:55:17 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 17 14:55:17 2015 +0000 |
| tree | 998a6c69cbef03ce7a6beded0ccbdbbfd4d9e8da | |
| parent | ba777d99627ed54759c5cef3f1faaee654867b8e [diff] | |
| parent | 213019578fd2e71bb0a359e98006a5a393580b01 [diff] |
am 21301957: (-s ours) am a118b48b: (-s ours) am 8a4d0c51: (-s ours) Import translations. DO NOT MERGE * commit '213019578fd2e71bb0a359e98006a5a393580b01': Import translations. DO NOT MERGE