tree db20571736f5a0a61ce49df5319bd272078e4e27
parent 22ebdcbbacc526e85871d29afa7228149842764e
parent 91771ebf7a12c0f8bfbc0ad8b9f6b66922e76a4f
author Bill Yi <byi@google.com> 1546042344 -0800
committer android-build-merger <android-build-merger@google.com> 1546042344 -0800

[automerger skipped] Import translations. DO NOT MERGE am: 7bb552c49e  -s ours
am: 91771ebf7a  -s ours

Change-Id: I84e57044916cb0b88ae40caac3dfbbe565f853d6