[automerger skipped] Disallow overlays for ResolverActivity am: 718c60bea7 -s ours am: 4f30365204 -s ours am: fdca2ddbbe -s ours
am skip reason: Merged-In Ied05088a5007e0f10cd3e1abd8d7da8ffeb3b674 with SHA-1 34534e1fd2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15956277
Change-Id: Iafa5218a037e31c30a017136a670bc45839c6a95
This commit is contained in:
committed by
Automerger Merge Worker
commit
db9c6d930e