tree 13a85ed3fb707002090a3a523d1d6d69bbd50cea
parent d15d5c8bd4a7208b3d40cefb3c2ed45c6971a5ff
parent 7fbc5ae88515362f41ff382d8e614e1225787183
author Baligh Uddin <baligh@google.com> 1409004470 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409004470 +0000

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