commit | 20f51e0841d3f6d108fe3140a3a186b35f21afec | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Wed Dec 03 17:19:33 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 03 17:19:33 2014 +0000 |
tree | 69f55f847844ccfa7695f709dd146054b63d97a2 | |
parent | 774d695e7071d6286b6b1da1b41b5e6c767c0389 [diff] | |
parent | 8b2db65f1b7efb30e90687203d895cb09db36c6f [diff] |
am 8b2db65f: (-s ours) am ee549e51: (-s ours) am 0fcd3f41: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '8b2db65f1b7efb30e90687203d895cb09db36c6f': Import translations. DO NOT MERGE