| commit | 36524e0cbd57e153840492d548c8471090525d05 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Jul 06 18:44:02 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Jul 06 18:44:02 2014 +0000 |
| tree | 6cc922b18cb72799525218d64e5dcb4757b03131 | |
| parent | 1b0960dec70847a7e23235a80e52b04ccf1a8676 [diff] | |
| parent | 9c9223d91eb57ba7f45532e551861696c55883ec [diff] |
am 9c9223d9: (-s ours) am 2ea222e6: (-s ours) am 93360f02: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '9c9223d91eb57ba7f45532e551861696c55883ec': Import translations. DO NOT MERGE