tree 00ee997b3bfb0ea0243b38de336eec8593ac3f2c
parent 8b43fdd100b0337d247350070fdd1bb154012d02
parent ce93a7756a120fd65199de6ed26bc2d30c234001
author Bill Yi <byi@google.com> 1585173382 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1585173382 +0000

[automerger skipped] Import translations. DO NOT MERGE am: c054f231ae -s ours am: 2f0bcbd3dc -s ours am: ce93a7756a -s ours

am skip reason: subject contains skip directive

Change-Id: If8fce843022b67fd156fccafdbb93b961e7baff0