commit | 1bc53e6339c86602df12b8c14d82b51792712904 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Thu Mar 27 23:04:53 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 27 23:04:53 2014 +0000 |
tree | 746c40ae9cb8f4683cf3e08377c8282cc15c32bd | |
parent | 3e9fac9037523826464c9a6e5ae4d18e9e955f09 [diff] | |
parent | e7a646241470e6f96e7c0da76afd637dac549a81 [diff] |
am e7a64624: (-s ours) am adff3f1f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'e7a646241470e6f96e7c0da76afd637dac549a81': Import translations. DO NOT MERGE