tree c028bfe537607823c37e2ffc8c713c73059d3130
parent cfb6dac38f28f3a4519727ad63d35a3e9c75f1b0
parent 2d714406cd10431c3b6581377d76b373a227ca76
author Baligh Uddin <baligh@google.com> 1445303623 +0000
committer android-build-merger <android-build-merger@google.com> 1445303623 +0000

am 869df29e: (-s ours) am c1ac011a: (-s ours) Import translations. DO NOT MERGE am: 35424cc2a6  -s ours am: 8a901a6133  -s ours am: 6cf8795a68  -s ours
am: 2d714406cd  -s ours

* commit '2d714406cd10431c3b6581377d76b373a227ca76':
  Import translations. DO NOT MERGE