[automerger skipped] Disallow overlays for ResolverActivity am: 978809e428 -s ours am: 893ce3e09c -s ours am: 80a149a827 -s ours am: aede81ce6c -s ours
am skip reason: Merged-In Ied05088a5007e0f10cd3e1abd8d7da8ffeb3b674 with SHA-1 718c60bea7 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15960136
Change-Id: I0edcb4b5c955f04bba290584659cdcc610d2ea56
This commit is contained in:
committed by
Automerger Merge Worker
commit
03001321c1