commit | 51de265795776130e175f72d73a9b2006e354e14 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Tue Sep 16 17:17:20 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 16 17:17:20 2014 +0000 |
tree | 35fe6b8133e0bb525364e085a6b3b5d54a02acec | |
parent | a19636711378e15436bf83f381ae811f778caf25 [diff] | |
parent | 30cfe2fd5251ca737b59fe16eaef5907907a6e89 [diff] |
am 30cfe2fd: (-s ours) am 5c714f49: (-s ours) am aaddee70: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '30cfe2fd5251ca737b59fe16eaef5907907a6e89': Import translations. DO NOT MERGE