tree 4092521851d2ae3bb1ecfd24c26ea15a5728da3e
parent 67c02c991d60a1abe42be97d46965b2f28bb837d
parent 72b61d0f2b79281eacdc6d5eec9ed2b58310e5ed
author Bill Yi <byi@google.com> 1528139432 -0700
committer android-build-merger <android-build-merger@google.com> 1528139432 -0700

[automerger skipped] Import translations. DO NOT MERGE am: f1a410e6d5  -s ours
am: 72b61d0f2b  -s ours

Change-Id: I22ca05a563f3ac4357aef01b0d48f8b3e6d2f8dd