commit | a850cda0e76325a26d326f4a4c019edee11ecd9a | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Wed Oct 01 02:26:34 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 01 02:26:34 2014 +0000 |
tree | b0b4cc4803ff075039e22a87d312be6421b85991 | |
parent | e0d64acb53e5e18f242feadd6416999b819bb09a [diff] | |
parent | 7eff88e2ea354685affabca75373872e565b3d99 [diff] |
am 7eff88e2: (-s ours) am 304bca81: (-s ours) am ca87a6c9: (-s ours) am ab4963b8: (-s ours) am 5dd9e4ae: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '7eff88e2ea354685affabca75373872e565b3d99': Import translations. DO NOT MERGE