tree e9432587c5194137441413e00b2efa48a246636f
parent 8feabb0c0231895376feee8ae6f5ea2a77e066de
parent f2a113b987b83ca8b5889a6912988db28421438c
author Bill Yi <byi@google.com> 1563213285 -0700
committer android-build-merger <android-build-merger@google.com> 1563213285 -0700

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

Change-Id: Ief8d398378cd73d050d0a92c94823c2086558ca5