tree 8f24cb76c6d6d7de9e83c9529bd0214e86e0be84
parent 4cb46b2604af2e2e7ca07c383939e13f75a21535
parent 4c1c489ea1b43e976cd535330cbc9322d6e35df0
author Bill Yi <byi@google.com> 1546102835 -0800
committer android-build-merger <android-build-merger@google.com> 1546102835 -0800

[automerger skipped] Import translations. DO NOT MERGE am: a4ed762deb  -s ours
am: 4c1c489ea1  -s ours

Change-Id: I3d7e5c070036b40c06755023424e8ae108edea09