| commit | 684d488ab44004dc166de8b2ceec466e47b98dd5 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Mon Nov 18 11:00:34 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 18 11:00:34 2013 -0800 |
| tree | 015c543c3bce81fd545d29297de9d3a47d58538f | |
| parent | fc1cd07da193966272b674409c23c23c47ef6362 [diff] | |
| parent | 0076f4ac0f35814fed1613cae1120b3d954fe985 [diff] |
am 0076f4ac: (-s ours) am 2cf27e71: (-s ours) am d7b40520: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '0076f4ac0f35814fed1613cae1120b3d954fe985': Import translations. DO NOT MERGE