tree e63a2c93c9b439a69c3cc7cd1180aa8352e6ce66
parent 6dbc6983cd1bdf8ccb6e55b3809eb7c478ee3d58
parent 78d6922fa07bdd408bc92e5c514ba55da740faeb
author Bill Yi <byi@google.com> 1559411421 -0700
committer android-build-merger <android-build-merger@google.com> 1559411421 -0700

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

Change-Id: Ic9c5164d666553f3f227fe8ab3328845b5f8c90e