tree 2665c8d8acf7455978b53d990f455a615d6d4631
parent 11008d7cfb2d3d1221826d451a4f098681b43ade
parent 9657a5717adcc3aa04ce18b187784a0c5d6200c5
author Bill Yi <byi@google.com> 1560479183 -0700
committer android-build-merger <android-build-merger@google.com> 1560479183 -0700

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

Change-Id: Ic6deeb9c4d1cd23f144268dcc136353facd5029d