tree 34197506d70ccb9f9f980220cf894a0753298260
parent 648d65030ab489faeac29147aa30902ee76514e7
parent 793546f301cec42a70bad4565e31e281067d7966
author TreeHugger Robot <treehugger-gerrit@google.com> 1650576639 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1650576639 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 793546f301 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17876168

Change-Id: I0785e79539b85029940dccd2095150da43a91009
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>