tree da0aad8537cf395d0ace84a9f53ad9805c5b1e4f
parent 49e6b18eeb639076de52701198e1e756ef66b9f4
parent 740ddc38bc267ac586badc63a301eb555ae631c4
author Bill Yi <byi@google.com> 1486640218 +0000
committer android-build-merger <android-build-merger@google.com> 1486640218 +0000

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: 740ddc38bc  -s ours

Change-Id: I967c516afc18ee97b2790cedd4747e8f93c57368