tree b2666280aa1029e5a594fbef024520b211ff45f1
parent 82ab657901ef66fba38c67d7c6589d22cc82e3dd
parent 69cc50f1e881b80db9767ce7535fe58067ca4222
author Baligh Uddin <baligh@google.com> 1446754060 +0000
committer android-build-merger <android-build-merger@google.com> 1446754060 +0000

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 69cc50f1e8  -s ours

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