tree 3c2b582f1e47f07287921354b284c062ca90a218
parent a56fd2441811d7efcd7e5b52fa4843079a94eb68
parent e2dd7e5bf819bef68f6d28d73cc9b4f6ae458dc3
author Lucas Dupin <dupin@google.com> 1638809324 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1638809324 +0000

[automerger skipped] Merge "Revert "Remove unused resources"" into sc-dev am: 18dbe0bba5 am: e2dd7e5bf8 -s ours

am skip reason: Merged-In I7f76ca4249431fb226972ed48cc1a4a10328a556 with SHA-1 e4bb3b1235 is already in history. Merged-In was found from reverted change.

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

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

Change-Id: Id81219d11a1101da0a0f09b9031008d136013106