tree 58c89436dda888768189aa449eed2abf99f15cb1
parent f61a22fe5d974ee568ac5b547a45e93f2b0cbcb2
parent aa4dbe2d84e4b92843496586ce70ba0eacaf51ae
author Baligh Uddin <baligh@google.com> 1446752930 +0000
committer android-build-merger <android-build-merger@google.com> 1446752930 +0000

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

* commit 'aa4dbe2d84e4b92843496586ce70ba0eacaf51ae':
  Import translations. DO NOT MERGE