tree 35b8e01f1a136e8920a4a1ea3fc20c3eeef77008
parent 11c7daa847167e2ad5a14cb90a1d51f9a8006e26
parent 9fa066742e9912f8102d41c8068612263e9f09f8
author Bill Yi <byi@google.com> 1574710606 -0800
committer android-build-merger <android-build-merger@google.com> 1574710606 -0800

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

Change-Id: I8b151b94fcd15d4efdd241cb2fec03d159d809c1