tree 79e8f303f0f02d283dc528630e6e9c599c476eb1
parent 13991797d52a9d279b38b4c77149d2305d2af45e
parent e24154fe9e5418fe5b8306faceeaf91f7963215a
author Bill Yi <byi@google.com> 1564782140 -0700
committer android-build-merger <android-build-merger@google.com> 1564782140 -0700

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

Change-Id: Ib195a8efb15dcde094c0169716845381ab4fa5a9