tree e2d39c6aa3125e442f9da2ca821b945766f7e33d
parent f32dd58f9563a7b4f5c1315a98b03f5ea1067036
parent 3bbd8bb8513ebce4c1ad765b636a40d885638e8f
author Bill Yi <byi@google.com> 1538889472 -0700
committer android-build-merger <android-build-merger@google.com> 1538889472 -0700

[automerger skipped] Import translations. DO NOT MERGE am: c731df816f  -s ours
am: 3bbd8bb851  -s ours

Change-Id: I6c226fefe3c9e73e4131ef1ff3e0cc23e99e1df5