tree 6aa403525d296b04a130428375cd65853fd6e221
parent cdf76acd4674d1f8dc2c27cde3328752f6fb1ad2
parent 18ab48703c61071328a149eaff328e878e73b370
author Baligh Uddin <baligh@google.com> 1414775775 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414775775 +0000

am 18ab4870: (-s ours) am a0960e75: (-s ours) Import translations. DO NOT MERGE

* commit '18ab48703c61071328a149eaff328e878e73b370':
  Import translations. DO NOT MERGE