| commit | 69d3d33fb0baeed6b93fc7f28c7a9a042f345361 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Oct 19 22:50:50 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Oct 19 22:50:50 2014 +0000 |
| tree | 0ac6f3de57b910e0efcceb03525fc312a3862975 | |
| parent | 7c6e3e015de6979579da7178f1488a8b61d5445e [diff] | |
| parent | 5aa08a0b5a1346a7561b2ee70e277dc8c170ec5d [diff] |
am 5aa08a0b: (-s ours) am 821db737: (-s ours) am 93d67f65: (-s ours) am 6949eb15: (-s ours) am 815b31f9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '5aa08a0b5a1346a7561b2ee70e277dc8c170ec5d': Import translations. DO NOT MERGE