tree 9b93deba282781ba4a3e3d8ee37f19f60c0826d7
parent 186433da52d7a2fbb1cf9ef88ca0463f681d9a3a
parent b4920a0398e32d57043b1d0a1d378b41a2eb9a0f
author Bill Yi <byi@google.com> 1558757312 -0700
committer android-build-merger <android-build-merger@google.com> 1558757312 -0700

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

Change-Id: I2c12739b6d25ca2767a3d13a15cf5de2fc70b4ee