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