tree 79e8f303f0f02d283dc528630e6e9c599c476eb1
parent e24154fe9e5418fe5b8306faceeaf91f7963215a
parent 00f87b1416f2194eb061c792029fc3f6c8347442
author Bill Yi <byi@google.com> 1564781365 -0700
committer android-build-merger <android-build-merger@google.com> 1564781365 -0700

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

Change-Id: If6f70d97509e9415177499b90aa5c4c37d581567