tree 58c89436dda888768189aa449eed2abf99f15cb1
parent b4b53b0741b6ff75842d6630d5d1010c4efa766c
parent 31f0d18a03115ba4a112af14fd007a2e9e7c4d72
author Baligh Uddin <baligh@google.com> 1446752573 +0000
committer android-build-merger <android-build-merger@google.com> 1446752573 +0000

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

* commit '31f0d18a03115ba4a112af14fd007a2e9e7c4d72':
  Import translations. DO NOT MERGE