tree 51a73adbaf99e2a1e9ab7641f45a6660fec24f6c
parent cbcab376601c599d23c3217ad35fa99322ec074f
parent 57088b83819f0b55f8c1f8b1943c814f3597901d
author Bill Yi <byi@google.com> 1569478493 -0700
committer android-build-merger <android-build-merger@google.com> 1569478493 -0700

[automerger skipped] Import translations. DO NOT MERGE
am: 57088b8381 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib4a837ef693ad8a41de54f8f39a83e8c1fc5cc5e