[automerger skipped] Add ALLOW_SLIPPERY_TOUCHES permission am: cccf19150f am: bc36420027 -s ours am: 450139ff05 -s ours
am skip reason: Merged-In I9ccdfd298f32c36b9c4da68c2e9c355c97dc7593 with SHA-1 cccf19150f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16549736
Change-Id: I7bed699b43672346efa565d2950637542f96bfbc
This commit is contained in:
committed by
Automerger Merge Worker
commit
95534b7936