tree b4d58817d9c4e995fe978578889d563149ba3b9a
parent ea0e76bc47ad75a61ccba5845e683687b197b73f
parent 9fe4ca37b993fb54532e3b77633dec7b3e317538
author Bill Yi <byi@google.com> 1508515543 +0000
committer android-build-merger <android-build-merger@google.com> 1508515543 +0000

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

Change-Id: I2f3c973b770186c297e612123ae5cd28997536ac