tree 7dac80a9dbfc486cf9b3685d48a97d510917581f
parent a3a24dee1c9a3e59dfa86db0317452343863d796
parent 97ddd025ac3966bb8a1113192ef090fb5e42f222
author Bill Yi <byi@google.com> 1560484004 -0700
committer android-build-merger <android-build-merger@google.com> 1560484004 -0700

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

Change-Id: I106b11790ce9eb95939f67cd3635486d9681832a