tree ead1135076a288d7eeb8d78f352b175ece0fab74
parent fa730043fd3503bb1cbfb4e95ef58e86d8f5c0ef
parent 4768cae30bb14a7c47dc47c2431362e949ad08bc
author Baligh Uddin <baligh@google.com> 1442632428 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442632428 +0000

am 4768cae3: (-s ours) am 09c3547a: (-s ours) Import translations. DO NOT MERGE

* commit '4768cae30bb14a7c47dc47c2431362e949ad08bc':
  Import translations. DO NOT MERGE