Weng Su
|
affec36497
|
[automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2 -s ours am: f05b8fbb79 -s ours am: 107ebcdc9e -s ours am: 658383d2e3 -s ours am: 097eef0b83 -s ours
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527 is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958166
Change-Id: Idc46f490721481625020c9cf995352d60833aa11
|
2021-10-08 07:50:06 +00:00 |
|
Automerger Merge Worker
|
22a096c969
|
Merge changes from topic "am-aaa7d89ac39d4f63b72ca511f2b60832" into sc-v2-dev-plus-aosp
* changes:
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483 -s ours am: 395ac6073c -s ours am: 374ef0012a -s ours am: 504af9e6cd -s ours am: 499e526da1 -s ours
[automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2 -s ours am: d5ff68889c -s ours am: b885452051 -s ours am: 5c878f37a6 -s ours am: 1c6bdf023f -s ours
|
2021-10-08 07:50:01 +00:00 |
|
Weng Su
|
3853c5e80e
|
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483 -s ours am: aed1ab9e45 -s ours am: 00e38c59cc -s ours am: c3531fb273 -s ours am: 163e2e711c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958167
Change-Id: I4e3eacead6793bbaba1e5980a47cfa18c75589fb
|
2021-10-08 07:49:58 +00:00 |
|
Weng Su
|
a72319cbe9
|
[automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2 -s ours am: f05b8fbb79 -s ours am: 107ebcdc9e -s ours am: 658383d2e3 -s ours am: 4ab81c701e -s ours
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527 is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958166
Change-Id: Iaedcf77ac28c7a4a94c6b51acc3126a72495227c
|
2021-10-08 07:49:58 +00:00 |
|
Weng Su
|
a380cafa97
|
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483 -s ours am: 395ac6073c -s ours am: 374ef0012a -s ours am: 504af9e6cd -s ours am: 499e526da1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958167
Change-Id: Idea08b9d1b8ac229438d31ef8057a42ee91b5f4a
|
2021-10-08 07:49:58 +00:00 |
|
Weng Su
|
6d66f61bc3
|
[automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2 -s ours am: d5ff68889c -s ours am: b885452051 -s ours am: 5c878f37a6 -s ours am: 1c6bdf023f -s ours
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527 is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958166
Change-Id: I430f79644c193bbb36a8eaa7e294f7efee4fe55c
|
2021-10-08 07:49:57 +00:00 |
|
Automerger Merge Worker
|
19e06f74c8
|
Merge changes from topic "am-b5e91ab227294ed58bbb399b5c08944f" into sc-v2-dev-plus-aosp
* changes:
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483 -s ours am: 395ac6073c -s ours am: 374ef0012a -s ours am: 504af9e6cd -s ours am: f19c1f0ed1 -s ours
[automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2 -s ours am: d5ff68889c -s ours am: b885452051 -s ours am: 5c878f37a6 -s ours am: dadde79d59 -s ours
|
2021-10-08 07:49:52 +00:00 |
|
Weng Su
|
3693a99a99
|
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483 -s ours am: 395ac6073c -s ours am: 374ef0012a -s ours am: 504af9e6cd -s ours am: f19c1f0ed1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958167
Change-Id: I28e0a3395ea1650b37dde95fb93e019b18d05bb6
|
2021-10-08 07:49:50 +00:00 |
|
Weng Su
|
e85d5acafd
|
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: ca67955d7d am: 973211dba5 -s ours am: e579105a14 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958174
Change-Id: Idf558a13fec83e245d4c2e4aa8110b73ddaa52dc
|
2021-10-08 07:49:49 +00:00 |
|
Weng Su
|
75856f7721
|
[automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2 -s ours am: d5ff68889c -s ours am: b885452051 -s ours am: 5c878f37a6 -s ours am: dadde79d59 -s ours
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527 is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958166
Change-Id: Ia4ef2d2b8a3e47aba7865ffdba7a2b249e0fd22f
|
2021-10-08 07:49:49 +00:00 |
|
Weng Su
|
a76039a3b9
|
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: f733da4859 -s ours am: 77d30c4d0c -s ours am: bcd7792138 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15951620
Change-Id: I8fba32c421816f72e9167c2903b45cd413eb1ef1
|
2021-10-08 07:49:48 +00:00 |
|
Weng Su
|
5b49dc51be
|
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: e92d1d1a6b am: 1400ff3139 -s ours am: ca90ea9e47 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958170
Change-Id: Idf4295eed0e23c31df46fcae83b169f58bbb21d4
|
2021-10-08 07:49:46 +00:00 |
|
Weng Su
|
1647570721
|
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: ca67955d7d am: 973211dba5 am: 0cf0a56f4d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958174
Change-Id: I604fa782bd283080f8e39eb1c800aa355ac17308
|
2021-10-08 07:49:31 +00:00 |
|
Weng Su
|
ce5b58b636
|
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: f733da4859 -s ours am: 77d30c4d0c -s ours am: 90f30c8eba -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15951620
Change-Id: Ie878bc96a19d58423e4d1d603f650151fbba9ab7
|
2021-10-08 07:49:30 +00:00 |
|
Weng Su
|
59b3a8317b
|
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: e92d1d1a6b am: 1400ff3139 am: 6229244dac -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958170
Change-Id: I55a79a296301214c068047cf9f5c663864372f82
|
2021-10-08 07:49:30 +00:00 |
|
Weng Su
|
e9600f3336
|
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: d05686b431 am: 457a63ce84 -s ours am: f41979632a -s ours am: 36a13c0cfe -s ours am: 6b29f7110a -s ours am: 6532190ccf -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958162
Change-Id: I6cac3fd07cbca238c3eba5306df2d1aca1d89df8
|
2021-10-08 07:45:44 +00:00 |
|
Weng Su
|
5bfc65b1c0
|
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483 -s ours am: aed1ab9e45 -s ours am: 00e38c59cc -s ours am: 26b65768ea -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958167
Change-Id: I95d7cc609bc9c4c157d0e04a3e52d49887cc5d6a
|
2021-10-08 07:45:31 +00:00 |
|
Weng Su
|
c64398a1b9
|
[automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2 -s ours am: f05b8fbb79 -s ours am: 107ebcdc9e -s ours am: bd89c97867 -s ours
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527 is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958166
Change-Id: I8873ae1938407f9e445ed02888471c780a733c3f
|
2021-10-08 07:45:30 +00:00 |
|
Weng Su
|
9923ea26ef
|
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483 -s ours am: 395ac6073c -s ours am: 374ef0012a -s ours am: 5922df7f44 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958167
Change-Id: I3eafd9a71e031f10ef8f1e6e29d1bb6a3f583dc2
|
2021-10-08 07:45:23 +00:00 |
|
Weng Su
|
9effff343f
|
[automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2 -s ours am: d5ff68889c -s ours am: b885452051 -s ours am: e81a5b9a13 -s ours
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527 is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958166
Change-Id: I736e3854289a9523d130d23365a5835268ca7e7f
|
2021-10-08 07:45:22 +00:00 |
|
Weng Su
|
3d77db28a7
|
[RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: ca67955d7d am: 1b732ee4cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958174
Change-Id: I337f829f450f08e82a3d9256eb6162e383350a06
|
2021-10-08 07:45:12 +00:00 |
|
Weng Su
|
c95ed2d0b3
|
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: f733da4859 am: 36558d2c6c -s ours
am skip reason: skipped by user wengsu
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15951620
Change-Id: I2ecc159cf55946dd4752e0877986ddd7f72cbf73
|
2021-10-08 07:45:11 +00:00 |
|
Weng Su
|
d243cc3d48
|
[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: e92d1d1a6b am: 372e90064b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958170
Change-Id: I3b08862f6fdc99f167100311cbadfbe80d69d596
|
2021-10-08 07:45:08 +00:00 |
|
TreeHugger Robot
|
df1a21033f
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6228bd3469 -s ours am: 9048523ba4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16000255
Change-Id: Ifed11914cd5dfa9bf3a227bd24a81970364b4700
|
2021-10-08 07:40:09 +00:00 |
|
TreeHugger Robot
|
2370d34040
|
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e am: 81a3e690c1 am: 94768f3b18 am: 07fe34aa57 am: f5e2d0dcb3 am: 59d01eec17
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985
Change-Id: I4ad2c1058cb4d6ea1bd367327c3b8fcaef09659b
|
2021-10-08 07:40:07 +00:00 |
|
TreeHugger Robot
|
3667dd4e0b
|
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e am: 81a3e690c1 am: 94768f3b18 am: f40e2700d3 am: 6e2eefe2c5 am: 7e02378a43
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985
Change-Id: I08e9cbe3380cc6dbdeba302d00e49f20827574cf
|
2021-10-08 07:40:01 +00:00 |
|
TreeHugger Robot
|
08aba4bb74
|
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into sc-dev am: df95750605 am: aeb6c685e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15987304
Change-Id: I99bd7cdf3832ce418150d4dffa7092f890b19917
|
2021-10-08 07:39:56 +00:00 |
|
Chen Chen
|
ac97c4755d
|
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-qpr-dev am: 7efc9b451c am: 3449eccd85 am: 3ca98306af
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15995587
Change-Id: I7b30ef5878a6c691fc223f4282016c700dce5c9e
|
2021-10-08 07:39:53 +00:00 |
|
Chen Chen
|
ac48c3a2fb
|
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b am: d96d13c4f1 am: b025b7fa88 am: 0d70b85832 am: d9eca4893d am: ca21133410 am: d0cebdde1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984
Change-Id: Ie1829e3ff35ac7d12af98e8b739737089380a9c8
|
2021-10-08 07:39:49 +00:00 |
|
Chen Chen
|
c849c3ff86
|
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b am: d96d13c4f1 am: b025b7fa88 am: 0d70b85832 am: 44deff97de am: b51bfd47db am: 5438c59920
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984
Change-Id: I91021db2cdd4df8ba8426c4a15d874e30b3138ef
|
2021-10-08 07:39:44 +00:00 |
|
TreeHugger Robot
|
ef0bd08a22
|
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-dev am: 1a049e065e am: 074f18fd8b am: 9f388f2a66 am: 15189d2ff6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994986
Change-Id: I35275f1b649c8a107eb671198dc116268b22c4d4
|
2021-10-08 07:39:39 +00:00 |
|
TreeHugger Robot
|
d542e403b9
|
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-dev am: 1a049e065e am: 818a481294 am: 050872ecf0 am: cbe25da458
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994986
Change-Id: I8372d0785f4c7d066c65ea29ce68980e6e364bb0
|
2021-10-08 07:39:35 +00:00 |
|
Weng Su
|
aaa0fa040b
|
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into qt-dev am: 3678155f90 am: 2fe0d45ab8 -s ours am: 86a02e1e8e -s ours am: 0dc4560066 -s ours am: 68952164ad -s ours am: 9552e28699 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164
Change-Id: I7173bb324e86990b14036486c4920b02f01a9766
|
2021-10-08 07:39:30 +00:00 |
|
Weng Su
|
d763f14341
|
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: 153b0f03f5 am: 0fe85baf93 -s ours am: 9ccd76cbde -s ours am: 7ab58102ff -s ours am: 80d84e4053 -s ours am: b462c1d9d5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164
Change-Id: Idcffae76635440acba39579a3e139f688ddb0f7e
|
2021-10-08 07:39:29 +00:00 |
|
Weng Su
|
c6d1339573
|
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: 6a2624e500 am: cbd0883356 -s ours am: 1f4b0eaa6f -s ours am: bd3dcfc61a -s ours am: 428d973b15 -s ours am: d9a3681733 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958163
Change-Id: Idbcd39623890f2f9a2b0243f8c7e42fbc55b6833
|
2021-10-08 07:39:28 +00:00 |
|
Weng Su
|
dc73326e39
|
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: d05686b431 am: 457a63ce84 -s ours am: f41979632a -s ours am: 2323109f93 -s ours am: 77e284042e -s ours am: 6ba2996eec -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958162
Change-Id: I72a7ba7864812835dc377fb34a35fa67f36f6c19
|
2021-10-08 07:39:28 +00:00 |
|
Weng Su
|
0e2cd55dfb
|
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into qt-dev am: 3678155f90 am: 2fe0d45ab8 -s ours am: 86a02e1e8e -s ours am: 54abe21d12 -s ours am: c0dd58ee8c -s ours am: 55a37d556e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164
Change-Id: Ibcaa22901d70ef28982a205c6eb5c485d41cac96
|
2021-10-08 07:39:17 +00:00 |
|
Weng Su
|
21636df6f0
|
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: 153b0f03f5 am: 0fe85baf93 -s ours am: 9ccd76cbde -s ours am: 9e73b1e4ed -s ours am: 1dbd53eb70 -s ours am: ba11285fd6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164
Change-Id: Ic3901313b09efb30da0397ae0dd87a31db1eb2b5
|
2021-10-08 07:39:17 +00:00 |
|
Weng Su
|
a4e6370acf
|
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: 6a2624e500 am: cbd0883356 -s ours am: 1f4b0eaa6f -s ours am: 70fce50634 -s ours am: ad77ce9784 -s ours am: d3fd57e2e1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958163
Change-Id: I6330f3b0fcf0412c040b5db6bfc63b4e1f467643
|
2021-10-08 07:39:16 +00:00 |
|
Weng Su
|
4212f9d165
|
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: d05686b431 am: 457a63ce84 -s ours am: f41979632a -s ours am: 36a13c0cfe -s ours am: 6b29f7110a -s ours am: ec9d3cf201 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958162
Change-Id: I897e32a6770d7c61204effef92255ff6943dba1b
|
2021-10-08 07:39:16 +00:00 |
|
Weng Su
|
0439d3baca
|
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483 -s ours am: aed1ab9e45 -s ours am: 00e38c59cc -s ours am: c3531fb273 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958167
Change-Id: If0aae24e0fbc0defa04f9a3ee4b4be8e0f71f32b
|
2021-10-08 07:39:06 +00:00 |
|
Weng Su
|
097eef0b83
|
[automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2 -s ours am: f05b8fbb79 -s ours am: 107ebcdc9e -s ours am: 658383d2e3 -s ours
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527 is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958166
Change-Id: Id048b49e76793e39dd3e7d5594942db98ac243e4
|
2021-10-08 07:39:06 +00:00 |
|
Weng Su
|
499e526da1
|
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483 -s ours am: 395ac6073c -s ours am: 374ef0012a -s ours am: 504af9e6cd -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958167
Change-Id: Ic02c7e10aa692466389a1610ed8843690fc2b827
|
2021-10-08 07:39:01 +00:00 |
|
Weng Su
|
1c6bdf023f
|
[automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2 -s ours am: d5ff68889c -s ours am: b885452051 -s ours am: 5c878f37a6 -s ours
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527 is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958166
Change-Id: I20853bdff515a8de7515498c929ab204c3fb8f78
|
2021-10-08 07:39:00 +00:00 |
|
Weng Su
|
e579105a14
|
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: ca67955d7d am: 973211dba5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958174
Change-Id: I06ef5c77f0b7eca0f15b78f83b8fd2db3fb29351
|
2021-10-08 07:38:55 +00:00 |
|
Weng Su
|
bcd7792138
|
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: f733da4859 -s ours am: 77d30c4d0c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15951620
Change-Id: Ia0c535eff0c406c9b5e52e541a9d75b16e703f29
|
2021-10-08 07:38:54 +00:00 |
|
Weng Su
|
ca90ea9e47
|
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: e92d1d1a6b am: 1400ff3139 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958170
Change-Id: Iffd455b9592dc57114e8bab3d2a5b7a0f7e197a7
|
2021-10-08 07:38:53 +00:00 |
|
TreeHugger Robot
|
0194a12bce
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6228bd3469 -s ours am: 9048523ba4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16000255
Change-Id: I2d160a4544880e74f1e02b8a7e997b107fe745c7
|
2021-10-08 07:38:37 +00:00 |
|
TreeHugger Robot
|
e6ef1d5c63
|
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e am: 81a3e690c1 am: 94768f3b18 am: 07fe34aa57 am: f5e2d0dcb3 am: 59d01eec17
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985
Change-Id: Ic150ea63e867858a670327806eff09deaf37e900
|
2021-10-08 07:38:32 +00:00 |
|
TreeHugger Robot
|
293765de71
|
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e am: 81a3e690c1 am: 94768f3b18 am: f40e2700d3 am: 6e2eefe2c5 am: 7e02378a43
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985
Change-Id: I6146187250451b1edc4553be4e656dac59bd6725
|
2021-10-08 07:38:23 +00:00 |
|