commit | cb21f780ba6fc07506607f7eac9f3cffb8b29145 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Sun Aug 17 14:16:11 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sun Aug 17 14:16:11 2014 +0000 |
tree | 1799e9a33b1e5212274a22fb0057642305300d7b | |
parent | 3ff86ed376d9f1e5122b89755c05c31957688fb6 [diff] | |
parent | a948c23168d1e954859390dc3245c31ad9be9476 [diff] |
am a948c231: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'a948c23168d1e954859390dc3245c31ad9be9476': Import translations. DO NOT MERGE