Treehugger Robot
|
499f2ff0eb
|
Merge "Add null check for session_info." into udc-qpr-dev
|
2023-08-03 07:57:53 +00:00 |
|
Nan Wu
|
f63e52db44
|
[automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into rvc-dev am: ba41b02d60 am: 4e16b6b4a7 -s ours am: 46f540cb09 -s ours am: d533736905 -s ours am: 30354234a3 -s ours am: 18bace2910 -s ours am: 93473610a3 -s ours am: 50eda5e3ab -s ours am: 7f74bcb54c -s ours am: c130a29bce -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047
Change-Id: I89d9d29c3dceb229e8e409dbd62922c6c5695fbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 06:11:19 +00:00 |
|
Nan Wu
|
2b15fef3e4
|
[automerger skipped] DO NOT MERGE Fix BAL via notification.publicVersion am: 75fcbb3761 am: 0e60d06403 -s ours am: b8835cee53 -s ours am: bb1253d16d -s ours am: df82e3f601 -s ours am: 70f32f6b40 -s ours am: 1056c3abbb -s ours am: 40014cda07 -s ours am: 5b7202a362 -s ours am: 06cc092a5b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047
Change-Id: Ie6d0ab884bf7291fc8dbf453c5e18e92bec3fd64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 06:11:15 +00:00 |
|
Treehugger Robot
|
ed8557f201
|
[automerger skipped] Merge "[conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c93" into rvc-qpr-dev am: 4b74ba4435 -s ours am: d892ae179e -s ours am: f715c988a2 -s ours am: 2c60a72dce -s ours am: f0ad126270 -s ours am: 501cddc99b -s ours am: 42fd03e73e -s ours am: 7499a939df -s ours am: 475ef3e2c1 -s ours
am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e021f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454
Change-Id: I88bd6a31f19a870095de8888aff0460c847c1b8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 06:10:49 +00:00 |
|
Anton Potapov
|
d270811920
|
[automerger skipped] [conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c93 am: 373c5ac49e -s ours am: 020addb64f -s ours am: d2983b8a0e -s ours am: a917310e04 -s ours am: 412ad58640 -s ours am: 06b24f00f6 -s ours am: 43a466ecdf -s ours am: fc4530d666 -s ours am: 7ffebb228c -s ours
am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e021f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454
Change-Id: I09267d654fd8a670b2f936a6665a1f98d0f9ee6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 06:10:44 +00:00 |
|
Nan Wu
|
313643111d
|
[automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into rvc-dev am: ba41b02d60 am: 4e16b6b4a7 -s ours am: 46f540cb09 -s ours am: d533736905 -s ours am: 30354234a3 -s ours am: 18bace2910 -s ours am: 0713b8ce43 -s ours am: d80debe691 -s ours am: 30aabba4d2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047
Change-Id: I3fd9eff933d0d778a4a4a27c982e533337de849b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 06:10:06 +00:00 |
|
Nan Wu
|
f124e504fe
|
[automerger skipped] DO NOT MERGE Fix BAL via notification.publicVersion am: 75fcbb3761 am: 0e60d06403 -s ours am: b8835cee53 -s ours am: bb1253d16d -s ours am: df82e3f601 -s ours am: 70f32f6b40 -s ours am: 2c6bc42dda -s ours am: d6f987ecbd -s ours am: 1c09e77d34 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047
Change-Id: I0f8dc5f12dfbf2e014ff023ef00e2bf3f304cf33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 06:09:41 +00:00 |
|
Treehugger Robot
|
0fe117bb56
|
[automerger skipped] Merge "[conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c93" into rvc-qpr-dev am: 4b74ba4435 -s ours am: d892ae179e -s ours am: f715c988a2 -s ours am: 2c60a72dce -s ours am: f0ad126270 -s ours am: 4e3309033f -s ours am: 0425b69c81 -s ours am: e6e5a7f5b1 -s ours
am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e021f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454
Change-Id: I3104a4a73d481a7c89e4338aa664692bb804c663
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 06:09:05 +00:00 |
|
Anton Potapov
|
064e00e7ab
|
[automerger skipped] [conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c93 am: 373c5ac49e -s ours am: 020addb64f -s ours am: d2983b8a0e -s ours am: a917310e04 -s ours am: 412ad58640 -s ours am: c06cecce55 -s ours am: 699fac4aa2 -s ours am: 9720f59e24 -s ours
am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e021f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454
Change-Id: I54b727920ea20c0e49a240b8234efcc1db75b83b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 06:08:44 +00:00 |
|
Nan Wu
|
c130a29bce
|
[automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into rvc-dev am: ba41b02d60 am: 4e16b6b4a7 -s ours am: 46f540cb09 -s ours am: d533736905 -s ours am: 30354234a3 -s ours am: 18bace2910 -s ours am: 93473610a3 -s ours am: 50eda5e3ab -s ours am: 7f74bcb54c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047
Change-Id: Ie36c496b39b9ad2344ecceb1f4bc1c88de2e4a39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 05:44:48 +00:00 |
|
Nan Wu
|
06cc092a5b
|
[automerger skipped] DO NOT MERGE Fix BAL via notification.publicVersion am: 75fcbb3761 am: 0e60d06403 -s ours am: b8835cee53 -s ours am: bb1253d16d -s ours am: df82e3f601 -s ours am: 70f32f6b40 -s ours am: 1056c3abbb -s ours am: 40014cda07 -s ours am: 5b7202a362 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047
Change-Id: I1ef113bc1e6e640a5e7fb5af71051ae23360bc28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 05:44:44 +00:00 |
|
Treehugger Robot
|
475ef3e2c1
|
[automerger skipped] Merge "[conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c93" into rvc-qpr-dev am: 4b74ba4435 -s ours am: d892ae179e -s ours am: f715c988a2 -s ours am: 2c60a72dce -s ours am: f0ad126270 -s ours am: 501cddc99b -s ours am: 42fd03e73e -s ours am: 7499a939df -s ours
am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e021f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454
Change-Id: I5f36d65ac7c7eafa84def160eac40385c5cf7bc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 05:44:18 +00:00 |
|
Anton Potapov
|
7ffebb228c
|
[automerger skipped] [conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c93 am: 373c5ac49e -s ours am: 020addb64f -s ours am: d2983b8a0e -s ours am: a917310e04 -s ours am: 412ad58640 -s ours am: 06b24f00f6 -s ours am: 43a466ecdf -s ours am: fc4530d666 -s ours
am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e021f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454
Change-Id: If64741aa10068e122a4c0f4ddd3bc8738fdd32a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 05:44:02 +00:00 |
|
Nan Wu
|
7f74bcb54c
|
[automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into rvc-dev am: ba41b02d60 am: 4e16b6b4a7 -s ours am: 46f540cb09 -s ours am: d533736905 -s ours am: 30354234a3 -s ours am: 18bace2910 -s ours am: 93473610a3 -s ours am: 50eda5e3ab -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047
Change-Id: Ie3711fefc92af60c21b9549c11653de9546c6f3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 05:24:24 +00:00 |
|
Nan Wu
|
5b7202a362
|
[automerger skipped] DO NOT MERGE Fix BAL via notification.publicVersion am: 75fcbb3761 am: 0e60d06403 -s ours am: b8835cee53 -s ours am: bb1253d16d -s ours am: df82e3f601 -s ours am: 70f32f6b40 -s ours am: 1056c3abbb -s ours am: 40014cda07 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047
Change-Id: I5885271cdb06951675d8149e82bc1b1650ab837f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 05:24:07 +00:00 |
|
Treehugger Robot
|
7499a939df
|
[automerger skipped] Merge "[conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c93" into rvc-qpr-dev am: 4b74ba4435 -s ours am: d892ae179e -s ours am: f715c988a2 -s ours am: 2c60a72dce -s ours am: f0ad126270 -s ours am: 501cddc99b -s ours am: 42fd03e73e -s ours
am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e021f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454
Change-Id: I7451095612aa451e7090ed42476eec77f662f9b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 05:23:26 +00:00 |
|
Anton Potapov
|
fc4530d666
|
[automerger skipped] [conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c93 am: 373c5ac49e -s ours am: 020addb64f -s ours am: d2983b8a0e -s ours am: a917310e04 -s ours am: 412ad58640 -s ours am: 06b24f00f6 -s ours am: 43a466ecdf -s ours
am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e021f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454
Change-Id: I5bf40a425cde2ed69aebee5b93c2b92fc8adce94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 05:22:59 +00:00 |
|
Nan Wu
|
30aabba4d2
|
[automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into rvc-dev am: ba41b02d60 am: 4e16b6b4a7 -s ours am: 46f540cb09 -s ours am: d533736905 -s ours am: 30354234a3 -s ours am: 18bace2910 -s ours am: 0713b8ce43 -s ours am: d80debe691 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047
Change-Id: Ia5ebc79d377c963d0e9f3a1138dc9db5a66a4ec3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 05:22:41 +00:00 |
|
Nan Wu
|
1c09e77d34
|
[automerger skipped] DO NOT MERGE Fix BAL via notification.publicVersion am: 75fcbb3761 am: 0e60d06403 -s ours am: b8835cee53 -s ours am: bb1253d16d -s ours am: df82e3f601 -s ours am: 70f32f6b40 -s ours am: 2c6bc42dda -s ours am: d6f987ecbd -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047
Change-Id: I91f9cd5b32cfebbaa2e23ebb5c463f9869cb4a36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 05:22:26 +00:00 |
|
Treehugger Robot
|
e6e5a7f5b1
|
[automerger skipped] Merge "[conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c93" into rvc-qpr-dev am: 4b74ba4435 -s ours am: d892ae179e -s ours am: f715c988a2 -s ours am: 2c60a72dce -s ours am: f0ad126270 -s ours am: 4e3309033f -s ours am: 0425b69c81 -s ours
am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e021f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454
Change-Id: I9e912dcd220a6bb967ad206444e9f1672a9af62e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 05:21:55 +00:00 |
|
Anton Potapov
|
9720f59e24
|
[automerger skipped] [conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c93 am: 373c5ac49e -s ours am: 020addb64f -s ours am: d2983b8a0e -s ours am: a917310e04 -s ours am: 412ad58640 -s ours am: c06cecce55 -s ours am: 699fac4aa2 -s ours
am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e021f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454
Change-Id: I6fe9403669fdb334dc600178f4ab71b279b79057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 05:21:41 +00:00 |
|
Nan Wu
|
d80debe691
|
[automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into rvc-dev am: ba41b02d60 am: 4e16b6b4a7 -s ours am: 46f540cb09 -s ours am: d533736905 -s ours am: 30354234a3 -s ours am: 18bace2910 -s ours am: 0713b8ce43 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047
Change-Id: Id1f19df175389204a05a2ad9dc18da3d70f0d1f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 04:44:20 +00:00 |
|
Nan Wu
|
d6f987ecbd
|
[automerger skipped] DO NOT MERGE Fix BAL via notification.publicVersion am: 75fcbb3761 am: 0e60d06403 -s ours am: b8835cee53 -s ours am: bb1253d16d -s ours am: df82e3f601 -s ours am: 70f32f6b40 -s ours am: 2c6bc42dda -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047
Change-Id: Ie9edda69f061bf1d82dc13b4449c826243b5646e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 04:43:55 +00:00 |
|
Treehugger Robot
|
0425b69c81
|
[automerger skipped] Merge "[conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c93" into rvc-qpr-dev am: 4b74ba4435 -s ours am: d892ae179e -s ours am: f715c988a2 -s ours am: 2c60a72dce -s ours am: f0ad126270 -s ours am: 4e3309033f -s ours
am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e021f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454
Change-Id: I6c600ff65a300a04453573a05b97bdb0f8848217
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 04:43:11 +00:00 |
|
Anton Potapov
|
699fac4aa2
|
[automerger skipped] [conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c93 am: 373c5ac49e -s ours am: 020addb64f -s ours am: d2983b8a0e -s ours am: a917310e04 -s ours am: 412ad58640 -s ours am: c06cecce55 -s ours
am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e021f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454
Change-Id: I1d1a5e4c1349564dd728f9b742e9f4791790b4a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 04:42:35 +00:00 |
|
Nan Wu
|
50eda5e3ab
|
[automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into rvc-dev am: ba41b02d60 am: 4e16b6b4a7 -s ours am: 46f540cb09 -s ours am: d533736905 -s ours am: 30354234a3 -s ours am: 18bace2910 -s ours am: 93473610a3 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047
Change-Id: I044107dbcef104ceec822bdf4f561e1249527605
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 04:38:34 +00:00 |
|
Nan Wu
|
40014cda07
|
[automerger skipped] DO NOT MERGE Fix BAL via notification.publicVersion am: 75fcbb3761 am: 0e60d06403 -s ours am: b8835cee53 -s ours am: bb1253d16d -s ours am: df82e3f601 -s ours am: 70f32f6b40 -s ours am: 1056c3abbb -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047
Change-Id: Ie30cc6110414247f60cc87e9162fcf7e22a109f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 04:38:29 +00:00 |
|
Treehugger Robot
|
42fd03e73e
|
[automerger skipped] Merge "[conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c93" into rvc-qpr-dev am: 4b74ba4435 -s ours am: d892ae179e -s ours am: f715c988a2 -s ours am: 2c60a72dce -s ours am: f0ad126270 -s ours am: 501cddc99b -s ours
am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e021f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454
Change-Id: I078ab1a3b9cb6b5eb89a4bc8b71f36e09282c770
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 04:38:01 +00:00 |
|
Anton Potapov
|
43a466ecdf
|
[automerger skipped] [conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c93 am: 373c5ac49e -s ours am: 020addb64f -s ours am: d2983b8a0e -s ours am: a917310e04 -s ours am: 412ad58640 -s ours am: 06b24f00f6 -s ours
am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e021f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454
Change-Id: I62e34fceba0f26f87ebfd5c43b36574ae2185c9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 04:37:44 +00:00 |
|
Nan Wu
|
93473610a3
|
[automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into rvc-dev am: ba41b02d60 am: 4e16b6b4a7 -s ours am: 46f540cb09 -s ours am: d533736905 -s ours am: 30354234a3 -s ours am: 18bace2910 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047
Change-Id: I109e79cfd2dd8a86e8e7fe382b773ee01d1bfe27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 03:59:03 +00:00 |
|
Nan Wu
|
1056c3abbb
|
[automerger skipped] DO NOT MERGE Fix BAL via notification.publicVersion am: 75fcbb3761 am: 0e60d06403 -s ours am: b8835cee53 -s ours am: bb1253d16d -s ours am: df82e3f601 -s ours am: 70f32f6b40 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047
Change-Id: I0a5b50a27092d43fdae8aaf92eeaa5bc86851e3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 03:58:51 +00:00 |
|
Treehugger Robot
|
501cddc99b
|
[automerger skipped] Merge "[conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c93" into rvc-qpr-dev am: 4b74ba4435 -s ours am: d892ae179e -s ours am: f715c988a2 -s ours am: 2c60a72dce -s ours am: f0ad126270 -s ours
am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e021f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454
Change-Id: I4c34f665e196246b9ca94acde666625449407697
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 03:58:37 +00:00 |
|
Anton Potapov
|
06b24f00f6
|
[automerger skipped] [conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c93 am: 373c5ac49e -s ours am: 020addb64f -s ours am: d2983b8a0e -s ours am: a917310e04 -s ours am: 412ad58640 -s ours
am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e021f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454
Change-Id: Ibfe2cfeb1d6329ce38dacb3c3f42cc7875991a15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 03:58:33 +00:00 |
|
Nan Wu
|
0713b8ce43
|
[automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into rvc-dev am: ba41b02d60 am: 4e16b6b4a7 -s ours am: 46f540cb09 -s ours am: d533736905 -s ours am: 30354234a3 -s ours am: 18bace2910 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047
Change-Id: Ied3da599c8318104560f45095b488dbea6bf6bce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 03:56:58 +00:00 |
|
Nan Wu
|
2c6bc42dda
|
[automerger skipped] DO NOT MERGE Fix BAL via notification.publicVersion am: 75fcbb3761 am: 0e60d06403 -s ours am: b8835cee53 -s ours am: bb1253d16d -s ours am: df82e3f601 -s ours am: 70f32f6b40 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047
Change-Id: I54e9051fa22bed5df3aad526dc06aea47c461317
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 03:56:36 +00:00 |
|
Treehugger Robot
|
4e3309033f
|
[automerger skipped] Merge "[conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c93" into rvc-qpr-dev am: 4b74ba4435 -s ours am: d892ae179e -s ours am: f715c988a2 -s ours am: 2c60a72dce -s ours am: f0ad126270 -s ours
am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e021f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454
Change-Id: I3f1914359059ef7293c35f2d458eb1f2932a4872
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 03:56:20 +00:00 |
|
Anton Potapov
|
c06cecce55
|
[automerger skipped] [conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c93 am: 373c5ac49e -s ours am: 020addb64f -s ours am: d2983b8a0e -s ours am: a917310e04 -s ours am: 412ad58640 -s ours
am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e021f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454
Change-Id: I985e068102ec0d9a5fd65e0370b673631b45cc88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 03:55:55 +00:00 |
|
Nan Wu
|
18bace2910
|
[automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into rvc-dev am: ba41b02d60 am: 4e16b6b4a7 -s ours am: 46f540cb09 -s ours am: d533736905 -s ours am: 30354234a3 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047
Change-Id: I427d149dac85645adadf79ad4c34e6cdc39f1d6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 03:14:00 +00:00 |
|
Nan Wu
|
70f32f6b40
|
[automerger skipped] DO NOT MERGE Fix BAL via notification.publicVersion am: 75fcbb3761 am: 0e60d06403 -s ours am: b8835cee53 -s ours am: bb1253d16d -s ours am: df82e3f601 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047
Change-Id: If037b704e0b60e2d3b9279cfe55b71d10dc4a896
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 03:12:57 +00:00 |
|
Treehugger Robot
|
f0ad126270
|
[automerger skipped] Merge "[conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c93" into rvc-qpr-dev am: 4b74ba4435 -s ours am: d892ae179e -s ours am: f715c988a2 -s ours am: 2c60a72dce -s ours
am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e021f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454
Change-Id: If835df376d2fea62848f10097f5793f59ff60f36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 03:12:20 +00:00 |
|
Anton Potapov
|
412ad58640
|
[automerger skipped] [conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c93 am: 373c5ac49e -s ours am: 020addb64f -s ours am: d2983b8a0e -s ours am: a917310e04 -s ours
am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e021f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454
Change-Id: I52df5a6f1232474b6e9870703ef6fac2d5cd14d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 03:11:48 +00:00 |
|
Nan Wu
|
30354234a3
|
[automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into rvc-dev am: ba41b02d60 am: 4e16b6b4a7 -s ours am: 46f540cb09 -s ours am: d533736905 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047
Change-Id: I89d9262e6e14b9bd3e1c8b19529c85dce16c031e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 02:26:56 +00:00 |
|
Nan Wu
|
df82e3f601
|
[automerger skipped] DO NOT MERGE Fix BAL via notification.publicVersion am: 75fcbb3761 am: 0e60d06403 -s ours am: b8835cee53 -s ours am: bb1253d16d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047
Change-Id: I7d2593480cc2449cb74d2a14a1ce4e18b59e25a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 02:26:39 +00:00 |
|
Treehugger Robot
|
2c60a72dce
|
[automerger skipped] Merge "[conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c93" into rvc-qpr-dev am: 4b74ba4435 -s ours am: d892ae179e -s ours am: f715c988a2 -s ours
am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e021f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454
Change-Id: Ib311ce45ac70a271c7f4755891f489a7e8a606b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 02:26:06 +00:00 |
|
Anton Potapov
|
a917310e04
|
[automerger skipped] [conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c93 am: 373c5ac49e -s ours am: 020addb64f -s ours am: d2983b8a0e -s ours
am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e021f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454
Change-Id: I81171a9c9e0584864d175ec88ff5f1fbd53f740b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 02:25:59 +00:00 |
|
Treehugger Robot
|
0b85fb8cfd
|
[automerger skipped] Merge "Resolve custom printer icon boundary exploit." into rvc-qpr-dev am: 91771262b1 -s ours am: f1f578c3f1 -s ours am: 6922602535 -s ours am: 8fd7bfdec1 -s ours am: 8badb22c1e -s ours am: ccd47c5f8f -s ours am: a491053f15 -s ours am: 22e4491da1 -s ours am: 8fc807eb14 -s ours
am skip reason: Merged-In Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce with SHA-1 0e0693ca9c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24108355
Change-Id: Ief948159ce41104fe4ac363880b6ca4b591a3276
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 02:10:41 +00:00 |
|
kumarashishg
|
e2d17427a9
|
[automerger skipped] Resolve custom printer icon boundary exploit. am: 658ed370a3 -s ours am: cfce4ff735 -s ours am: b4f03d1e8b -s ours am: cdf541a51b -s ours am: dbd499f084 -s ours am: e24c3a7478 -s ours am: d6865ed7f2 -s ours am: b90ad18689 -s ours am: c081a59ce2 -s ours
am skip reason: Merged-In Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce with SHA-1 0e0693ca9c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24108355
Change-Id: Id8a2f5406213afa4342c611af8c5bfba889da39c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 02:10:20 +00:00 |
|
Treehugger Robot
|
68dd1b519f
|
[automerger skipped] Merge "Resolve custom printer icon boundary exploit." into rvc-qpr-dev am: 91771262b1 -s ours am: f1f578c3f1 -s ours am: 6922602535 -s ours am: 8fd7bfdec1 -s ours am: 8badb22c1e -s ours am: 15e852fc23 -s ours am: ea0e4bae14 -s ours am: 16c8f4509c -s ours
am skip reason: Merged-In Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce with SHA-1 0e0693ca9c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24108355
Change-Id: Idec73245d9500b80e8bc105cfcad4dfe25b396d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 02:08:47 +00:00 |
|
kumarashishg
|
175576404e
|
[automerger skipped] Resolve custom printer icon boundary exploit. am: 658ed370a3 -s ours am: cfce4ff735 -s ours am: b4f03d1e8b -s ours am: cdf541a51b -s ours am: dbd499f084 -s ours am: 56b7b6de93 -s ours am: 6bec1988e0 -s ours am: b52e71faec -s ours
am skip reason: Merged-In Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce with SHA-1 0e0693ca9c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24108355
Change-Id: I11cbe66e5fa107b4827b002b7ee511cd2ffcb04c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 02:08:42 +00:00 |
|
Peter Lin
|
9908fe95a0
|
[automerger skipped] Merge "set NBM_FEATURE_FLAG to true." into udc-d1-dev am: dd7c827ffb -s ours
am skip reason: Merged-In I88b4e5dfd16b1efbe87bf21459755ff2b4900d1f with SHA-1 1129bf752a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23854268
Change-Id: Ie2a1057aea3d6a42fe249fa77a57d7c2e21a437e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 02:07:36 +00:00 |
|