tree 3e57528539c0c104bfeb416707d2c62c04f33dcd
parent 81ebfc39e324e149c3445be8bd97ccb94f1e0676
parent 5ce016b52567b23d7611bc076994904a6502f716
author Bill Yi <byi@google.com> 1526824520 -0700
committer android-build-merger <android-build-merger@google.com> 1526824520 -0700

[automerger skipped] Import translations. DO NOT MERGE
am: 5ce016b525  -s ours

Change-Id: I188468ee3a9fd2942431a00e909aa93122960336