commit | 5a292604eb2b85e6418918e131b50e73d76c5e6a | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Mon Aug 25 22:07:50 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 25 22:07:50 2014 +0000 |
tree | 13a85ed3fb707002090a3a523d1d6d69bbd50cea | |
parent | d15d5c8bd4a7208b3d40cefb3c2ed45c6971a5ff [diff] | |
parent | 7fbc5ae88515362f41ff382d8e614e1225787183 [diff] |
am 7fbc5ae8: (-s ours) am 2be95a8b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit '7fbc5ae88515362f41ff382d8e614e1225787183': Import translations. DO NOT MERGE