commit | 4647d3a9d112c6779e70d622e4a6035036272098 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Tue Mar 25 17:11:34 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 25 17:11:34 2014 +0000 |
tree | 7c67abb754a48610ecfa88fb3dadaa3626211644 | |
parent | cfc630eb9406f1a3319a0742cc5e247168097891 [diff] | |
parent | 48553b956fce1e05a1684a830b15b8b278863911 [diff] |
am d838ebc6: (-s ours) am bc01c0e8: (-s ours) am 45ab8271: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'd838ebc6c8edc23e473046274d615cc39674a09a': Import translations. DO NOT MERGE