commit | 304bca817237e050ebd530dd5db990329f3f7235 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Mon Sep 29 21:16:00 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 29 21:16:00 2014 +0000 |
tree | 2fa86315018aa73dbc1818f7077c865c7b3bdf79 | |
parent | 66832afafa85c6afba8db293f6a1d6b333be79f1 [diff] | |
parent | ca87a6c90aa3efe3d4429bcd772bee49843aebe1 [diff] |
am ca87a6c9: (-s ours) am ab4963b8: (-s ours) am 5dd9e4ae: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'ca87a6c90aa3efe3d4429bcd772bee49843aebe1': Import translations. DO NOT MERGE