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

Browse Source

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

Change-Id: I546d15b890be7b81d63bb8512cc49b50ef32b538

...

This commit is contained in:

TreeHugger Robot

2020-03-20 04:19:42 +00:00

committed by Automerger Merge Worker

parent 80e8fb186f 303eabfc93

commit b4922a7647

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available