| commit | 73a436174c24927f62aaf72ed5b9ea864d07295b | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Mon Jul 07 19:02:46 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 07 19:02:46 2014 +0000 |
| tree | 77ae6dc696eb7f2942e6d5bfebdccb95eebf8a6e | |
| parent | 197d4683b0f5c418d4f55140748d524ebad1aa81 [diff] | |
| parent | 007cbcbb103d914aa97708f703b27d4b8be492cc [diff] |
am 007cbcbb: (-s ours) am 3163d3c6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '007cbcbb103d914aa97708f703b27d4b8be492cc': Import translations. DO NOT MERGE