| commit | a1ce3b5cee66b0e43a58ce940817a06ea2a6e7eb | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Oct 29 07:01:09 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 07:01:09 2014 +0000 |
| tree | 10da860fcff71886af91d082e31f0e1917926848 | |
| parent | e6cf2e0c8a82de9fbfcf386d9009560013f0e4bd [diff] | |
| parent | 7b31b34898cebc5587ba34a619af8bff2921cc27 [diff] |
am 7b31b348: (-s ours) am d68f6f49: (-s ours) am f9f10d03: (-s ours) am 24081d3c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '7b31b34898cebc5587ba34a619af8bff2921cc27': Import translations. DO NOT MERGE