Bill Yi
|
513daaceac
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I88a1d89c46344777542c3c10f65e7f1c596d1e46
|
2023-08-03 14:59:42 -07:00 |
|
Nan Wu
|
a66bbfe998
|
[automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into sc-dev am: 0f4454ce79 am: 92e29bc9e0 -s ours am: 283de987cb -s ours am: afc27392e6 -s ours am: cd37e1a15e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983543
Change-Id: I1603fc427856d3a9f97e335cec6231c846f2ce77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 16:00:56 +00:00 |
|
Nan Wu
|
fe0fc51319
|
[automerger skipped] DO NOT MERGE Fix BAL via notification.publicVersion am: 8d839e4985 am: 93100d607d -s ours am: 66264b5b3b -s ours am: fd3fd4d265 -s ours am: 2662b93e28 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983543
Change-Id: Ibed0c04c0d52c9d51a4208ddfa0290bfe7fc4a98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 16:00:24 +00:00 |
|
Nan Wu
|
cd37e1a15e
|
[automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into sc-dev am: 0f4454ce79 am: 92e29bc9e0 -s ours am: 283de987cb -s ours am: afc27392e6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983543
Change-Id: I331cd6000111945fb20c51b15200ba7ee1166103
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 15:20:48 +00:00 |
|
Nan Wu
|
2662b93e28
|
[automerger skipped] DO NOT MERGE Fix BAL via notification.publicVersion am: 8d839e4985 am: 93100d607d -s ours am: 66264b5b3b -s ours am: fd3fd4d265 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983543
Change-Id: I527e2108088a3e2e2f75caf9f2fb72a5b0596e34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 15:20:25 +00:00 |
|
Nan Wu
|
afc27392e6
|
[automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into sc-dev am: 0f4454ce79 am: 92e29bc9e0 -s ours am: 283de987cb -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983543
Change-Id: I50cbc29fbcd9a88c0e6e57cb3529a9fddef2cf56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 15:16:46 +00:00 |
|
Nan Wu
|
fd3fd4d265
|
[automerger skipped] DO NOT MERGE Fix BAL via notification.publicVersion am: 8d839e4985 am: 93100d607d -s ours am: 66264b5b3b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983543
Change-Id: I47ffc2942c006be414321294e9aa61c2179e65fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 15:15:59 +00:00 |
|
Nan Wu
|
283de987cb
|
[automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into sc-dev am: 0f4454ce79 am: 92e29bc9e0 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983543
Change-Id: I8afc06000ec66ec940cb825565cbdbabf01c4ea3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 14:32:25 +00:00 |
|
Nan Wu
|
66264b5b3b
|
[automerger skipped] DO NOT MERGE Fix BAL via notification.publicVersion am: 8d839e4985 am: 93100d607d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983543
Change-Id: If40193d7a577f3d8578496cc9ad4cdc64f257ba1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 14:32:02 +00:00 |
|
Nan Wu
|
92e29bc9e0
|
Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into sc-dev am: 0f4454ce79
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983543
Change-Id: I30008c5803c5438f24702fec8af587faafd90812
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 13:29:51 +00:00 |
|
Nan Wu
|
93100d607d
|
DO NOT MERGE Fix BAL via notification.publicVersion am: 8d839e4985
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983543
Change-Id: If2f86d38c7350b8bde1e4a993b55af142cdf292d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-03 13:29:33 +00:00 |
|
Nan Wu
|
0f4454ce79
|
Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into sc-dev
|
2023-08-03 12:42:16 +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
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
Nan Wu
|
ba41b02d60
|
Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into rvc-dev
|
2023-08-02 22:56:31 +00:00 |
|
Treehugger Robot
|
8fd7bfdec1
|
[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 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: Idb462426dd6b8e8e66581231e04286c146fe8089
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-02 22:41:04 +00:00 |
|
kumarashishg
|
cdf541a51b
|
[automerger skipped] Resolve custom printer icon boundary exploit. am: 658ed370a3 -s ours am: cfce4ff735 -s ours am: b4f03d1e8b -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: I99eaec1f81ce32f4eb162a80b50046381294b287
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-02 22:40:44 +00:00 |
|
Treehugger Robot
|
6922602535
|
[automerger skipped] Merge "Resolve custom printer icon boundary exploit." into rvc-qpr-dev am: 91771262b1 -s ours am: f1f578c3f1 -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: I1c0fa54bc1f2da2b13de4aacba493df0340ecb3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-02 21:57:43 +00:00 |
|
kumarashishg
|
b4f03d1e8b
|
[automerger skipped] Resolve custom printer icon boundary exploit. am: 658ed370a3 -s ours am: cfce4ff735 -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: I83f5e736a707941a8a3f1c7c54254684fa4b3433
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-02 21:57:24 +00:00 |
|