commit | e5932c4305c2210ebd74c86b4b59eb741a9f59b5 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Sun Aug 17 14:41:29 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sun Aug 17 14:41:29 2014 +0000 |
tree | 577280f2b548eca02f7a767e76e762a0373abe1c | |
parent | 4664126e586cfe8d3c5e93576dc3d9a82d3e0bb5 [diff] | |
parent | c84711e9e71ade17918904c30d333b3f8890f37e [diff] |
am c84711e9: (-s ours) am 12e627fc: (-s ours) am 3599894f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'c84711e9e71ade17918904c30d333b3f8890f37e': Import translations. DO NOT MERGE