tree 784b697094684c896cc3bd7fac6be298f5425444
parent 7c8feecd929e1aa7e05829ca709cc5ed6f18b185
parent 052e40835932d17c7b965fdf723a7c112860c9a2
author Bill Yi <byi@google.com> 1563082334 -0700
committer android-build-merger <android-build-merger@google.com> 1563082334 -0700

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

Change-Id: Ia0fd3cd12967f19af45da4cbd0c08127764ef686