| commit | 72c253eaf360185a7ab34de84934e809d72e7eca | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Jul 06 18:21:24 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Jul 06 18:21:24 2014 +0000 |
| tree | 6cc922b18cb72799525218d64e5dcb4757b03131 | |
| parent | c354c0fb8d70f54a266cd0b84a52dc1c0900dabe [diff] | |
| parent | c1f450dc64d43c0893858538c96fd0a1e7992565 [diff] |
am c1f450dc: (-s ours) am fd5e4617: (-s ours) am f2e29071: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'c1f450dc64d43c0893858538c96fd0a1e7992565': Import translations. DO NOT MERGE