tree 8a362389959abe0437bd0b6bd05e2ce157fb050a
parent d6feab9fca52fcd1b7609b4b2701592fb6b17de8
parent 885dfb7134254668c5a960bb92d2a8bc5521257e
author Bill Yi <byi@google.com> 1568849288 -0700
committer android-build-merger <android-build-merger@google.com> 1568849288 -0700

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

Change-Id: I515adc3e8a0a534fde521ec1f0ff909b53c28057