| commit | 82eafa6fa4820f5180be85a29cf56805df68de60 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jun 03 18:48:16 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 03 18:48:16 2015 +0000 |
| tree | 08b524c28fa1f33d9b0d019e72ded2248856b00d | |
| parent | 93184e1e2c50aa318c12ad0f0e14f49f8541afc3 [diff] | |
| parent | 9e7f4ae8f7da971f135b9ace689a6d9cff0096a7 [diff] |
am 9e7f4ae8: (-s ours) am a267ba3b: (-s ours) Import translations. DO NOT MERGE * commit '9e7f4ae8f7da971f135b9ace689a6d9cff0096a7': Import translations. DO NOT MERGE