[automerger skipped] Merge "Make Activites touch opaque - DO NOT MERGE" into sc-dev am: 8d0b023f20 am: be5aef034e -s ours am: 3c8562a76b -s ours am: 4a5df0c0be -s ours am: dbe17b1459 -s ours am: 116b63f95f -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18029563 Change-Id: Ib7221b7e8327bdaa334c836cd912ae041113aec4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: