tree 51a73adbaf99e2a1e9ab7641f45a6660fec24f6c
parent c4a53258c5bd7d737f5ef449fa4c0e539017f1ba
parent a0783f9dc72d6156c93c5a1eca629cd6c41251a7
author Bill Yi <byi@google.com> 1569705450 -0700
committer android-build-merger <android-build-merger@google.com> 1569705450 -0700

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

Change-Id: Ie4914b9890a06c7a33941dffe5dbeb607f34f810