tree b4d58817d9c4e995fe978578889d563149ba3b9a
parent 770e4008b211d030536b314da2df2c0cfeefa995
parent 5fdf106b8b52639faf8878b884892ead19e348c5
author Bill Yi <byi@google.com> 1508514021 +0000
committer android-build-merger <android-build-merger@google.com> 1508514021 +0000

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

Change-Id: I6da8e75d0ac5544d6524f8a180bc302896f5a93f