tree 9a4f4a93afed9c4875713122121551552eb1b41c
parent 1a21a5182969a21cc29d106b3864f4bf913a959d
parent 3c1d30a80e6685cf21aac635fdb39efba0199631
author Bill Yi <byi@google.com> 1547425580 -0800
committer android-build-merger <android-build-merger@google.com> 1547425580 -0800

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

Change-Id: I4232bb605673dfd1db47eefc685954ce7f89c0c9