[automerger skipped] Disallow overlays for ResolverActivity am: 978809e428 am: 157dea0ce9 -s ours am: 99338cc865 -s ours am: 454b408991 -s ours am: 69f23275ff -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: I2442a63bbd4b3f6b07fa45e12d7206f860fdd632
This commit is contained in:
committed by
Automerger Merge Worker
commit
2b3374d08a