| commit | 7b31b34898cebc5587ba34a619af8bff2921cc27 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Oct 23 17:25:21 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 17:25:21 2014 +0000 |
| tree | cba62d0d64153aa2169651696bc238591341d679 | |
| parent | 9a58fb53f323ec19d558e63ffe8483619718c57e [diff] | |
| parent | d68f6f49f0b9c8866325a555e8cfbb2c63dbb828 [diff] |
am d68f6f49: (-s ours) am f9f10d03: (-s ours) am 24081d3c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'd68f6f49f0b9c8866325a555e8cfbb2c63dbb828': Import translations. DO NOT MERGE