tree bd116ec6cf8216fd61ecddbd45aac712a8f15c01
parent 72ee0c217f0da97fc0ca1a6c48516fd0c89b7c3e
parent 06e81aa16a2d05d090c65c82bcfa6fb23c374948
author Miranda Kephart <mkephart@google.com> 1604977081 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604977081 +0000

[automerger skipped] [DO NOT MERGE] Make GlobalScreenshot PendingIntents immutable am: 441247985a am: 40297a24eb am: 368eecbec0 -s ours am: b20d5c3add -s ours am: f69d6cfbbb am: 0bf1c91f92 -s ours am: 435a7cd8fb am: ecf2db455c am: 255001d08f am: 06e81aa16a -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12773217

Change-Id: Iad96dc34ab51557d690419a04a964d08943c2c1a