tree 3e57528539c0c104bfeb416707d2c62c04f33dcd
parent d919c12ad0feed25bb6e82332d0ab565304d14e8
parent 5759b04e94a87749a7626ec9d01334bef0ac320b
author Bill Yi <byi@google.com> 1527273742 -0700
committer android-build-merger <android-build-merger@google.com> 1527273742 -0700

[automerger skipped] Import translations. DO NOT MERGE
am: 5759b04e94  -s ours

Change-Id: Ic3be6b7e7f1230660aa9c2ac9902d0463cb01da0