tree da4cb2ad6c93805a36fe545bcac688babc18c18e
parent 6fcec5e819af3081a53927cf4b3fc990738f348e
parent a26090c1ae457e06744c6864ec44cad85c52aa3a
author Miranda Kephart <mkephart@google.com> 1604964709 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604964709 +0000

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

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

Change-Id: I17bb5ac77e2e2482e81fa3bc90accb10202767d3