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