tree 6afc6fc084d6993ad78e4cff53343229da4502a1
parent 2ddf2cbfa311d9c8cf687587e871c929ab142e47
parent 9c441a4054a13eae007d2e23e0b5d4396aa1bf06
author Bill Yi <byi@google.com> 1558886125 -0700
committer android-build-merger <android-build-merger@google.com> 1558886125 -0700

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

Change-Id: I56f66c084eb1edf8f223fd36dcacff1ddaf12633