| commit | 2ffe6a2340ab05fb38f5051a1ce35b12af895fce | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Oct 19 22:37:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Oct 19 22:37:20 2014 +0000 |
| tree | 12534000ff0e4eda41742040b9324d6e435a9d0b | |
| parent | 821db73793e5b6f779cada48a51a9740eb885fff [diff] | |
| parent | d25f8443ebf3ec5adb28ae6e24c3d17f6a0bdf7b [diff] |
am d25f8443: (-s ours) am 6a887105: (-s ours) am c04edfc3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'd25f8443ebf3ec5adb28ae6e24c3d17f6a0bdf7b': Import translations. DO NOT MERGE