tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent 7473d692c6953ce7bc33898fdead1a5dbf5c8e0e
parent 658fdd291b1bfaf7e7dbe40c34ecbf757a100d87
author Baligh Uddin <baligh@google.com> 1422669702 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669702 +0000

am 658fdd29: (-s ours) am 266749b5: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-queens

* commit '658fdd291b1bfaf7e7dbe40c34ecbf757a100d87':
  Import translations. DO NOT MERGE