commit | 1686b5c3f58a7732d74f5f1cfa7dbfa3107dba06 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Wed Dec 03 07:56:51 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 03 07:56:51 2014 +0000 |
tree | e32eca44b4b21d74ef8730686d18c6b869c159fb | |
parent | 842556a450ec8de489e155599e3d24f47269bdcd [diff] | |
parent | 70b44364a1a0c7d6879670ead2fcbc7be02ec7f8 [diff] |
am 70b44364: (-s ours) am 925c27be: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '70b44364a1a0c7d6879670ead2fcbc7be02ec7f8': Import translations. DO NOT MERGE