tree 4092521851d2ae3bb1ecfd24c26ea15a5728da3e
parent d2fa869bea07d369892b45cbb52095b0859e5af4
parent dbbc150b7ee6b43105b4751afd4a6f5d5d9c63db
author Bill Yi <byi@google.com> 1533397286 -0700
committer android-build-merger <android-build-merger@google.com> 1533397286 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 7435f64406  -s ours am: 878c6a9d75  -s ours
am: dbbc150b7e  -s ours

Change-Id: Ib3a09da2465607fe3215b1b0ad2c28ed06fc4546