tree 5b5545a9a5a359e1c32d4801d68e4022b088d173
parent b5379354ec0390b21ebb3e5319c3be7bd4f964ec
parent e71399e4a973238caca960a6238de0b48f115b7d
author Bill Yi <byi@google.com> 1560496508 -0700
committer android-build-merger <android-build-merger@google.com> 1560496508 -0700

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

Change-Id: I329dcf6e5b56fdd0c7491689f468b5a8f4f09d4e