tree 95fda543f4675ae6ecf3d3f9762ba546bf2e3046
parent b1f6ae1b6f9bf5257ff654fed7e4b75bed797c0a
parent e22f2a4b968b4b096d0626db69fb2f2b5c12ee10
author Bill Yi <byi@google.com> 1585174344 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1585174344 +0000

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

am skip reason: subject contains skip directive

Change-Id: Ib957680f4cf259f17e0e333c0c1c3474d9532dae