tree 631c5dd62f3f928743438b379dd84a8ed836f5d0
parent c6ac0888ee99f36c5ea92b79b916e9bd83dc7168
parent 4069b050f1fbdba99b72474fae0d83c7cb243488
author Baligh Uddin <baligh@google.com> 1408119115 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408119115 +0000

am 4069b050: (-s ours) am 2ba60e4a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '4069b050f1fbdba99b72474fae0d83c7cb243488':
  Import translations. DO NOT MERGE