| commit | 711a12f90fdf2e74c1a64026148cc29d1a123fbd | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Mon Jul 07 19:43:03 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 07 19:43:03 2014 +0000 |
| tree | 16f6359ac554bcb5aaec68b490baca19d5591ec2 | |
| parent | b5f0a8bb5d422802d20a8eac829d75e2a823744c [diff] | |
| parent | 73a436174c24927f62aaf72ed5b9ea864d07295b [diff] |
am 73a43617: (-s ours) am 007cbcbb: (-s ours) am 3163d3c6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '73a436174c24927f62aaf72ed5b9ea864d07295b': Import translations. DO NOT MERGE