tree df1496a40e573826bcfac61467a5862ba7e2d755
parent 241c81a614cf2b9fc64e207648072baabf10caf2
parent 6071b11999f5c9b4d4f58fb5153e20a9161a0b19
author TreeHugger Robot <treehugger-gerrit@google.com> 1634252069 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1634252069 +0000

[automerger skipped] Merge "Disallow overlays for ResolverActivity" into qt-dev am: f3661fc780 am: d4be365335 -s ours am: e3d406ab9a -s ours am: 6071b11999 -s ours

am skip reason: skipped by user joshtrask

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

Change-Id: I5c653d3d75eb94c07d79a6f50157e9ed6e5e8088