tree 39a673d6a92271c4bcf870838e0c60dfa418c0d0
parent a5361f57a0dd501a28345a393a5df36b3a2d4905
parent b14f109e24eb118420b8350fe19e65e327ce9778
author Baligh Uddin <baligh@google.com> 1442632439 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442632439 +0000

am b14f109e: (-s ours) am 5ecfed31: (-s ours) Import translations. DO NOT MERGE

* commit 'b14f109e24eb118420b8350fe19e65e327ce9778':
  Import translations. DO NOT MERGE