| commit | 1ddf059e6d5a601e12d75e1cf2913ef24cac2bb8 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 22 14:31:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 22 14:31:40 2015 +0000 |
| tree | ea3a51a5eb52af1faf0e316af511f2b4a868e12d | |
| parent | 1c6d9005d30ef3f9cc30fb89e78751b7033a453f [diff] | |
| parent | 069bf3c2a41a0c97b31602309965f28293b59200 [diff] |
am 069bf3c2: (-s ours) am 234bd0f4: (-s ours) am b568f3fd: (-s ours) Import translations. DO NOT MERGE * commit '069bf3c2a41a0c97b31602309965f28293b59200': Import translations. DO NOT MERGE