commit | 7d1ad869127ea8a19cb8cef06d5f823b8295b546 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Thu Mar 27 23:16:55 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 27 23:16:55 2014 +0000 |
tree | e7d3a44ef87fcb3934496ee583cb074457677f6b | |
parent | 49fb8aeff5b1ee928f698860c1915b742a3adbf7 [diff] | |
parent | e136f5e26f238c6450cad467435cce2f3a75f1c3 [diff] |
am e136f5e2: (-s ours) am 0b7f300a: (-s ours) am 852750b3: (-s ours) am 537ea90e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'e136f5e26f238c6450cad467435cce2f3a75f1c3': Import translations. DO NOT MERGE