tree d3205e4d3781158a677095ab9ab3147caeb326a7
parent f5b1101af91690d700a68eaae964c6be24a33210
parent bfb7a7227c0eccf0edba5672e03d800e1b97e147
author Bill Yi <byi@google.com> 1569961591 -0700
committer android-build-merger <android-build-merger@google.com> 1569961591 -0700

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

Change-Id: I0cd9a23fc9d8dc550921d4406e77485dd5a56582