tree 972b9b403bf98dfc47a6dacb533d1e0738da397d
parent 7e88748b286df0763c1c83f26867a16cafe314f7
parent 4635a40596067650e618423637a88accc7ddad8a
author Baligh Uddin <baligh@google.com> 1390502515 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1390502515 -0800

am 4635a405: (-s ours) Import translations. DO NOT MERGE

* commit '4635a40596067650e618423637a88accc7ddad8a':
  Import translations. DO NOT MERGE