tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 1e6e69888109fa24da71e8c859ff12d5a16ca657
parent 6cf8795a688fb2cf45a990114453d2dfa667bf75
author Baligh Uddin <baligh@google.com> 1445302534 +0000
committer android-build-merger <android-build-merger@google.com> 1445302534 +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

* commit '6cf8795a688fb2cf45a990114453d2dfa667bf75':
  Import translations. DO NOT MERGE