tree 3d9553e57e963e413511beed639c4944cb76518d
parent cccf446c53a020a63ec6a2a1b61e0768501a62ed
parent b6d0a204f5eaeedb427797ceac55f17905ef9744
author TreeHugger Robot <treehugger-gerrit@google.com> 1631033054 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1631033054 +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: 95fbe3a389 -s ours am: b8ec3622e5 -s ours am: db29bd89d8 -s ours am: b6d0a204f5 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I9680300220603c67359f473a7b68b9b6a748e790