tree 58c89436dda888768189aa449eed2abf99f15cb1
parent 501a7521f04efc78337b43fba7493e68926dd372
parent 2523c61fb78e9f6022b9762750842a65bcb224f3
author Baligh Uddin <baligh@google.com> 1446753247 +0000
committer android-build-merger <android-build-merger@google.com> 1446753247 +0000

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

* commit '2523c61fb78e9f6022b9762750842a65bcb224f3':
  Import translations. DO NOT MERGE