tree 2d12e9c6ffd03bb01f2c9e4081c6de06beeded04
parent 09e27185e3238f9c932744758b5163c415d07d43
parent 9c91ccb0755acc6d5ea10759e631f061862c4e91
author Bill Yi <byi@google.com> 1559343807 -0700
committer android-build-merger <android-build-merger@google.com> 1559343807 -0700

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

Change-Id: I61cc690d09a6a62a9551c7f40984f7e356974690