commit | 176f4e38740abed0f7f301d836d492ca0ef8058f | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jul 29 14:04:50 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 29 14:04:50 2015 +0000 |
tree | 0bc7e9197d0558eef4018e9e6e7203cab67c9c60 | |
parent | 3f59371072cf1c0e88c0c4e3ddc26e4ab0bc9c32 [diff] | |
parent | 3b292202c0bafcb2e5667202de699efbcd1d9c9b [diff] |
am 3b292202: (-s ours) am 6ace2bc9: (-s ours) Import translations. DO NOT MERGE * commit '3b292202c0bafcb2e5667202de699efbcd1d9c9b': Import translations. DO NOT MERGE