tree 3d584e61b0761d2a83af7210a54e88a6e45ee809
parent db60838dda9aedd77dde81d397dc583b2ab43849
parent 471e2c285e5d58c5b2a5b1044b6aa90abbab6351
author Bill Yi <byi@google.com> 1541194348 -0700
committer android-build-merger <android-build-merger@google.com> 1541194348 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 7288a72ef6  -s ours
am: 471e2c285e  -s ours

Change-Id: I89f768c54a6935b7b484c17a2321054f33e7434e