tree a58b069a6ede7172eafdee0705b51237b401a8f9
parent 6a885ae2426b2bfed3ef60d18de65e52c331fcf8
parent 4670d420c1ffdaa30f5185e3e9f4bf039e06f579
author Bill Yi <byi@google.com> 1562340131 -0700
committer android-build-merger <android-build-merger@google.com> 1562340131 -0700

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

Change-Id: I1f3d91a8dd8071a88d35a01965141cc8c01657a9