tree df5002817ff3dccadf02acdfc0c0377575363479
parent 6b2064e5c6d3613867ed5b714c128e61fbe7b3ef
parent 1e001229042dfdca5f25b4d3a56d6a0315007351
author Bill Yi <byi@google.com> 1538374121 -0700
committer android-build-merger <android-build-merger@google.com> 1538374121 -0700

[automerger skipped] Import translations. DO NOT MERGE skipped: b19a62bcf8 skipped: 5883bd3177
am: 1e00122904  -s ours

Change-Id: I5efbcb9878eff1c5df234fdafc8fec126dbf95ca