tree 5b5545a9a5a359e1c32d4801d68e4022b088d173
parent 93c559f0c20c200c7a4663f089f287c1cc21278c
parent 235dacdcdcebcd68ba688ff59e7ed8e4788ba60e
author Bill Yi <byi@google.com> 1564006446 -0700
committer android-build-merger <android-build-merger@google.com> 1564006446 -0700

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

Change-Id: I10a55a93071fe9dec8fdcae89ccd791368a651a7