tree c6af0ff488d9085df6d6d0e8f0a0ea05be8c620b
parent 715c266e935d1acc660934a73932acf9225aca4f
parent f52b0bd3dfd214f7286191e420b9c05d31dafdb0
author Bill Yi <byi@google.com> 1561511681 -0700
committer android-build-merger <android-build-merger@google.com> 1561511681 -0700

[automerger skipped] Import translations. DO NOT MERGE
am: f52b0bd3df -s ours
am skip reason: subject contains skip directive

Change-Id: Id97a809877e223f34c19a5acc8740e18010f7460