tree 047e0b1801968e6a0e0838da0130ad7975902cfd
parent 4726532b18e5ba39b4577aa129153ef2db48ea55
parent fb46471c3c67e2866c223810dab62f8a56191e5e
author Bill Yi <byi@google.com> 1519113375 +0000
committer android-build-merger <android-build-merger@google.com> 1519113375 +0000

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: fb46471c3c  -s ours

Change-Id: I52ecd76a0acfa7875d43429c5136afc0bf2db425