[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21 -s ours am: c551f39977 -s ours am: e849d212b7 -s ours am: b8aa9ad04d -s ours am: 2a2a81dea5 -s ours am: 1e764fb0a6 -s ours am: 5e708fd301 -s ours am: aff7f97f8c -s ours am: 474c9fd1da -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016141 Change-Id: If5c613e81cd7dff7236d53acfcf7c3b1d43b8191
This commit is contained in: