[automerger skipped] Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into qt-qpr1-dev am: 3c137d807d -s ours am: dc1f295a59 -s ours am: f28bf18e57 -s ours

am skip reason: Change-Id Ie954d8a4b7153d6a4cac40621f363b45185990f2 with SHA-1 91399607fe is in history

Change-Id: I66c941397f1550d020ae12090319ac8d19e01745
This commit is contained in:
TreeHugger Robot
2020-03-20 03:43:37 +00:00
committed by Automerger Merge Worker

Diff Content Not Available