tree 08148819c8491daa2d88fdd4bdeedc96b837500f
parent 0ec0fc315df101082e64be74c7c43ee43d5b78cf
parent 8790927424ce0b1e76f15843a3980c14b4a55073
author Baligh Uddin <baligh@google.com> 1397145484 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397145484 +0000

am 87909274: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-nova

* commit '8790927424ce0b1e76f15843a3980c14b4a55073':
  Import translations. DO NOT MERGE