tree 5f61a269caef918a7c7783fb9923e46c4e8688df
parent d078b84c33d331c7535068eea079cae6a7c6049b
parent 611475df609bbbd9c515313658ba41ceaa20047b
author Baligh Uddin <baligh@google.com> 1410749500 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410749500 +0000

am 611475df: (-s ours) Import translations. DO NOT MERGE

* commit '611475df609bbbd9c515313658ba41ceaa20047b':
  Import translations. DO NOT MERGE