tree 1f49501f73b24a8b1e52b9792e12f1587494dc38
parent 9ba88beda4b2e91a82806807b2cbfd473a8fe34d
parent 2946b97d5e4e13dc9a55f31f5da6e0139af24184
author Bill Yi <byi@google.com> 1491122382 +0000
committer android-build-merger <android-build-merger@google.com> 1491122382 +0000

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

Change-Id: I6bb7b4a52a0620750a12ab3573c86d55befae940