commit | b22ef14f4470fabd461fe3b56c0dd38110fb8cdb | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Thu Jun 26 16:54:50 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 26 16:54:50 2014 +0000 |
tree | ee617577bd2bcabf8aaee3ec9262535843ce0fc1 | |
parent | 1634e49edffc0517356d2a875f0226169c8a69b0 [diff] | |
parent | bbf69273a7ac6cc95a9b0682d0fe62f3a0afb35f [diff] |
am bbf69273: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit 'bbf69273a7ac6cc95a9b0682d0fe62f3a0afb35f': Import translations. DO NOT MERGE