| commit | a842a0813cbda44facfcb6493a5f9f70a27d8024 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Nov 01 07:40:46 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 01 07:40:46 2013 -0700 |
| tree | d41472385ba4866350f0aa8e8f78c0ef6ac1f802 | |
| parent | 5b76be492bcc7d0c9cc387bf3e16f29ced5ec2b2 [diff] | |
| parent | a053e1ffd567975da2bcb57c378aef16a7ddeaa9 [diff] |
am a053e1ff: (-s ours) am 3f4c6bb5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'a053e1ffd567975da2bcb57c378aef16a7ddeaa9': Import translations. DO NOT MERGE