tree 4c866f730d19d22036b7beb59ae8fe0f552c21f5
parent 079862ded9219905b1197d3d10a6edafb7398102
parent 88ac099f2ead10da710be158569362e412633700
author TreeHugger Robot <treehugger-gerrit@google.com> 1631032740 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1631032740 +0000

[automerger skipped] Merge "[DO NOT MERGE] Fixing unsafe pending intent in notification" into qt-dev am: bfc095df4f am: ec3f123bf9 -s ours am: 9bf0157d5f -s ours am: bb022106ef -s ours am: 2787813708 -s ours am: 88ac099f2e -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id51c811ab03c7400cad58300f967484dd3278569