tree 9e6267039cc4d6403dab4fa6363059f4fd50eabd
parent 8c0c1c0ed6aadc4c8179e748c7d171138fd3ffc9
parent 307cf10c2a64757bc91f375166f31728d417b508
author Baligh Uddin <baligh@google.com> 1408141220 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408141220 +0000

am 307cf10c: (-s ours) Import translations. DO NOT MERGE

* commit '307cf10c2a64757bc91f375166f31728d417b508':
  Import translations. DO NOT MERGE