[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: 3235c7d0fe -s ours am: f6a2f44893 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15727764 Change-Id: I1064da359100d1ab5d80d18211c2ea716b86332f
This commit is contained in: