tree 13a85ed3fb707002090a3a523d1d6d69bbd50cea
parent 63cdabda89dbcfbe9caf76292003ad822c13c5d6
parent d12be991afdaa80a556273e5ad91db2a824002c8
author Baligh Uddin <baligh@google.com> 1409004464 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409004464 +0000

am d12be991: (-s ours) am 21281ae6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit 'd12be991afdaa80a556273e5ad91db2a824002c8':
  Import translations. DO NOT MERGE