| commit | a60df014e27d9cd57396655b98922394ff7d73bb | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Mar 13 17:19:21 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 13 17:19:21 2014 +0000 |
| tree | aa09b3aed4a2755a8ae6367bd16bbb1556de73fb | |
| parent | 429720754d85e1b13bc9001adaa23a0b0db04b61 [diff] | |
| parent | 846f036ef15a2bea6c522e5b75b351b28c29953c [diff] |
am 846f036e: (-s ours) am 14b82fd7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '846f036ef15a2bea6c522e5b75b351b28c29953c': Import translations. DO NOT MERGE