tree b93c80a1a8308fca0da8851e491d46d36524c658
parent 20cac86b405fb9ba96e9970d72bcaf1318c8cadf
parent 30166a7e23977d96cfdb7cb257c08c5af8365468
author TreeHugger Robot <treehugger-gerrit@google.com> 1598107971 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598107971 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 30166a7e23 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4d74a3f4d5bfb3784d3ff85b03d52f11307b18e4