tree a3a6b1fc660e3255acb0143b10ab229f4840b87c
parent 333ae98b1de20fb946c06dcf5c2d07b50227f0a2
parent 56f0eca93d5fb0e6dae4ae3e607d38124ab7ae65
author Bill Yi <byi@google.com> 1573348581 -0800
committer android-build-merger <android-build-merger@google.com> 1573348581 -0800

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

Change-Id: Ie004216ce9b51ca520b8c82e8613f8f35b2c9913