tree 11a72aad88e107bf23cde6b2a61f02ae0a52cf1e
parent 71671b910009137443e20571d88b48f0f2d31574
parent a8302ec0281c8663a9bb2380b920940903d573e9
author Bill Yi <byi@google.com> 1528745116 -0700
committer android-build-merger <android-build-merger@google.com> 1528745116 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 2494723d40  -s ours
am: a8302ec028  -s ours

Change-Id: I166bbdd46a77f4d8393db2389145c580db7a3d99