| commit | e16fe1aa7cd332ddf09d25ae2fee43d6c5cb884a | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Feb 20 18:13:43 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 20 18:13:43 2014 +0000 |
| tree | 9b4509e070e1a5aa5b484eaa3b52335c5b3f21f0 | |
| parent | e9a5424cc64e44812383ab9e417f18b8a1f647d1 [diff] | |
| parent | 13e850160d21008597239dc974c805df057d4e1b [diff] |
am 13e85016: (-s ours) am 749e6b9c: (-s ours) am 5da96060: (-s ours) am f887a67d: (-s ours) am aa20b274: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '13e850160d21008597239dc974c805df057d4e1b': Import translations. DO NOT MERGE