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