tree f5e1bfc6206bee570a483389fe6ed20b829ee966
parent 8090efc8499cd5c6ebd795efce3bff50d38b51ae
parent a23723be51a9081db2048e2bdf789b267306e334
author Bill Yi <byi@google.com> 1567540385 -0700
committer android-build-merger <android-build-merger@google.com> 1567540385 -0700

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

Change-Id: I2e05e2e099c72f1490ffd7a2dcdd249b8728cd28