tree b9f6ae549939e365cdaa9cdc8e1444bd7b56835f
parent 2170554e98f9c8deee958b4468a998814796a04a
parent 4e7a7d3cd35bfbb2369a8c0abdad187f534728f6
author Miranda Kephart <mkephart@google.com> 1604964671 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604964671 +0000

[automerger skipped] Merge "[DO NOT MERGE] Make GlobalScreenshot PendingIntents immutable" into qt-dev am: b968a16db7 am: 2a84aae3ce -s ours am: 4e7a7d3cd3

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

Change-Id: I11fbe1ba58de0622a2d23d990777d5fdc8d766b1