tree 39a673d6a92271c4bcf870838e0c60dfa418c0d0
parent 49b7d5aa1999794d365af62287443d2c209600c3
parent 69f37de22490c9682760e09b5d1451512c5e6dd0
author Baligh Uddin <baligh@google.com> 1443538214 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443538214 +0000

am 69f37de2: (-s ours) Import translations. DO NOT MERGE

* commit '69f37de22490c9682760e09b5d1451512c5e6dd0':
  Import translations. DO NOT MERGE