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
|
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
|
8fc807eb14
|
[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 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: I02350dc77ffe7cfc054da973009ec81bd95269b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 02:00:45 +00:00 |
|
kumarashishg
|
c081a59ce2
|
[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 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: If7c4f6d5bbcdf885deaf9cc38d3e90fdf2455aff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 02:00:24 +00:00 |
|
Nan Wu
|
d533736905
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047
Change-Id: I154cd5b8e0c3ac44f14bec7b2591fa767220c79c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 01:39:17 +00:00 |
|
Treehugger Robot
|
22e4491da1
|
[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 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: I1540f8b95f5b4368ef6ff13370cbe3a78728d0dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 01:39:11 +00:00 |
|
Nan Wu
|
bb1253d16d
|
[automerger skipped] DO NOT MERGE Fix BAL via notification.publicVersion am: 75fcbb3761 am: 0e60d06403 -s ours am: b8835cee53 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047
Change-Id: I3c185d84110dcf811abd12840a1814de1ed7245a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 01:39:08 +00:00 |
|
Treehugger Robot
|
f715c988a2
|
[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 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: I22bf5e8f7e2d28e4b8bf48fdfeaedaf7b585cf2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 01:38:50 +00:00 |
|
Anton Potapov
|
d2983b8a0e
|
[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 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: I4011edb3b7713639b223d2fafdbd9bf997747d93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 01:38:41 +00:00 |
|
Treehugger Robot
|
16c8f4509c
|
[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 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: I46f6e9f2b05fedab43e83ef5b9f507d7fc5c265c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 01:38:28 +00:00 |
|
kumarashishg
|
b90ad18689
|
[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 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: I2f5ef783ade4aa83fcd70e1818e705e037b1f966
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 01:38:23 +00:00 |
|
kumarashishg
|
b52e71faec
|
[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 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: Ibf2e3043a1d6db6d4fde895ccc534dcd5319b298
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 01:38:05 +00:00 |
|
Peter Lin
|
dd7c827ffb
|
Merge "set NBM_FEATURE_FLAG to true." into udc-d1-dev
|
2023-08-03 01:10:54 +00:00 |
|
Nan Wu
|
46f540cb09
|
[automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into rvc-dev am: ba41b02d60 am: 4e16b6b4a7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047
Change-Id: Id0877ae54f352919f8530cfb08b807917dcb57d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 00:59:28 +00:00 |
|
Treehugger Robot
|
ea0e4bae14
|
[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 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: I80376e9791316e5ba79478d549fda202ede31636
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 00:59:06 +00:00 |
|
Nan Wu
|
b8835cee53
|
[automerger skipped] DO NOT MERGE Fix BAL via notification.publicVersion am: 75fcbb3761 am: 0e60d06403 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047
Change-Id: If54ffab0f29f2dc145864b0f340ba8e428908c38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 00:58:54 +00:00 |
|
kumarashishg
|
6bec1988e0
|
[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 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: I8c1fa16cad9a06efc188168c7c6f104ee75c4aa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 00:58:39 +00:00 |
|
Treehugger Robot
|
d892ae179e
|
[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 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: Ic31cc783397f3a29e7c29365044be2b52e91dcaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 00:58:13 +00:00 |
|
Anton Potapov
|
020addb64f
|
[automerger skipped] [conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c93 am: 373c5ac49e -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: Icedc57c9c52c15042fa39b259c7d2a01dbb11155
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 00:57:41 +00:00 |
|
Treehugger Robot
|
a491053f15
|
[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 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: I2e14a716d4ac4fcfe6a0b44f9bea3254183b79a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 00:53:32 +00:00 |
|
kumarashishg
|
d6865ed7f2
|
[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 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: I22a8ce68d32de673f23b2ebd25d0b4a90894c075
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 00:53:24 +00:00 |
|
Nan Wu
|
4e16b6b4a7
|
Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into rvc-dev am: ba41b02d60
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047
Change-Id: I87c1b8a390a0801f25d040ec880eb96c6e160fda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 00:37:33 +00:00 |
|
Nan Wu
|
0e60d06403
|
DO NOT MERGE Fix BAL via notification.publicVersion am: 75fcbb3761
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047
Change-Id: Iced365d9bef5572692a48787e226264b27a2bd82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 00:37:12 +00:00 |
|
Treehugger Robot
|
4b74ba4435
|
Merge "[conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c93" into rvc-qpr-dev
|
2023-08-03 00:23:27 +00:00 |
|
Treehugger Robot
|
ccd47c5f8f
|
[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 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: I685f41aa9f9c9f7017b682a27305374dc03d4b81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 00:11:47 +00:00 |
|
kumarashishg
|
e24c3a7478
|
[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 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: I087a4cb8cc8af0e246374660905975c5ced90565
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 00:11:32 +00:00 |
|
Treehugger Robot
|
15e852fc23
|
[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 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: I5bdeadd5632bde02d582c312b4fb868249406baf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 00:09:24 +00:00 |
|
kumarashishg
|
56b7b6de93
|
[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 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: Ic008553f7756cf481b9dab4d69e32659caf0a797
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 00:09:12 +00:00 |
|
Treehugger Robot
|
199294705b
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
|
2023-08-03 00:02:58 +00:00 |
|
Treehugger Robot
|
f1aa3932c7
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
|
2023-08-03 00:02:58 +00:00 |
|
Treehugger Robot
|
8badb22c1e
|
[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 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: I7ace06b83bda1d61399675f1e0fe39bea6d99173
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-02 23:28:34 +00:00 |
|
kumarashishg
|
dbd499f084
|
[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 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: I786ff10a4b6e58eeb4c9737d350c9fc25a3ebdb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-02 23:27:47 +00:00 |
|