tree 95fda543f4675ae6ecf3d3f9762ba546bf2e3046
parent 10c9843bf3bdc4eb8c518a5f2ee41a4f80daabfc
parent 2f0bcbd3dc5c2bb1852c47fba0a9c549f09a34ba
author Bill Yi <byi@google.com> 1585172617 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1585172617 +0000

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

am skip reason: subject contains skip directive

Change-Id: Icb31a46077daaff8ac0c0e52e02027be778e9d99