Xin Li
cd93e5598a
[automerger skipped] Merge UP1A.230905.019 am: 791d3759a7
-s ours
...
am skip reason: Merged-In I5e7ecc45c732b5711d076b1e5783355a07c92846 with SHA-1 3d9216ab4a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24625489
Change-Id: Id167c4d7a74539f27681b768e4cef90899684730
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 19:45:31 +00:00
Xin Li
791d3759a7
Merge UP1A.230905.019
...
Merged-In: I5e7ecc45c732b5711d076b1e5783355a07c92846
Change-Id: I3d31ca80c8ab03ed919748217efc9dae404b9b2e
2023-08-31 12:10:57 -07:00
Treehugger Robot
f22c744c3c
Merge "Add aosp_bluejay_hwasan" into main am: 20153b7051
am: fee2a1d564
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2729338
Change-Id: I897901016c94cf34695b5d04fe6c91fa4b7fa3b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 00:27:46 +00:00
Xin Li
effae880f2
[automerger skipped] Merge Android U (ab/10368041) am: 2a93fae2a8
-s ours
...
am skip reason: Merged-In I59500ba819f0c36f130b26b86b9dfe4415fa1792 with SHA-1 6875c3d2e2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24182586
Change-Id: Id116f61dc8881f95476c32bcc7b453f86f88eb99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 23:58:58 +00:00
Treehugger Robot
fee2a1d564
Merge "Add aosp_bluejay_hwasan" into main am: 20153b7051
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2729338
Change-Id: I952166410ecde868795fc4a6b1686aefc3674b2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 22:54:51 +00:00
Treehugger Robot
20153b7051
Merge "Add aosp_bluejay_hwasan" into main
2023-08-28 21:30:57 +00:00
Florian Mayer
59488616be
Add aosp_bluejay_hwasan
...
Bug: 297918380
Change-Id: I906deed8db5f347263c4035d3b6235bd9960055a
2023-08-28 13:10:44 -07:00
Treehugger Robot
e0ecc1e31e
Merge "gps: Disable Vzw SUPL OTDOA" into udc-dev am: a588213208
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24220183
Change-Id: Ib5f3ab894d6b2e8411aad9a1d3d9e6d9365f6551
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 22:11:12 +00:00
Treehugger Robot
a588213208
Merge "gps: Disable Vzw SUPL OTDOA" into udc-dev
2023-08-21 21:20:40 +00:00
Lokesh Kumar Goel
fd81f8b7fb
Update bluejay SVN to 47 am: d0c9858ecd
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24436878
Change-Id: Ic4c223ac5754d8b5cae81417e31396fc836b0ed5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 22:55:50 +00:00
Lokesh Kumar Goel
3b4ff78f90
Update bluejay SVN to 46 am: 257fa8a2d5
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24424446
Change-Id: I50b5e6fcf60cc7fbc869440923ec3c2432af0f80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 05:58:18 +00:00
Lokesh Kumar Goel
d0c9858ecd
Update bluejay SVN to 47
...
Bug: 295937899
Change-Id: Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3
2023-08-16 05:38:55 +00:00
Lokesh Kumar Goel
257fa8a2d5
Update bluejay SVN to 46
...
Bug: 295937899
Change-Id: I77611e1da02e476e85804b24b8dee51dbdefce13
2023-08-15 00:10:58 +00:00
Android Build Coastguard Worker
0f5b815396
[coastguard skipped] Merge sparse cherrypicks from sparse-10656238-L62300000962563337 into udc-release.
...
COASTGUARD_SKIP: I5e7ecc45c732b5711d076b1e5783355a07c92846
COASTGUARD_SKIP: I2aef39ad72c40092933c576d5c20b9dae5f7de90
Change-Id: I0e99a4a2c8d21321d7cd6ac4b909fb42fa09612f
2023-08-14 22:56:52 +00:00
Android Build Coastguard Worker
c77ad6a2d8
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24407407'] into sparse-10656238-L62300000962563337.
...
SPARSE_CHANGE: I5e7ecc45c732b5711d076b1e5783355a07c92846
Change-Id: I2aef39ad72c40092933c576d5c20b9dae5f7de90
2023-08-14 22:47:02 +00:00
Bassem Khalife
40b8836aeb
Update bluejay SVN to 45
...
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3d9216ab4a8f0300de9ceabac0261df69743e3e4 )
Merged-In: I5e7ecc45c732b5711d076b1e5783355a07c92846
Change-Id: I5e7ecc45c732b5711d076b1e5783355a07c92846
2023-08-14 22:46:08 +00:00
Xin Li
2a93fae2a8
Merge Android U (ab/10368041)
...
Bug: 291102124
Merged-In: I59500ba819f0c36f130b26b86b9dfe4415fa1792
Change-Id: Iffe4bd4cdf12ea8795bee3d48d6018222d11360a
2023-08-14 15:32:41 -07:00
Android Build Coastguard Worker
6e09e2e76e
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24392813', 'googleplex-android-review.googlesource.com/24405206'] into udc-release.
...
Change-Id: Iac2859758008ea4b2e0a416a00108323a2f47c70
2023-08-14 19:53:00 +00:00
Bassem Khalife
c8d4239669
Update bluejay SVN to 44
...
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:71b17bb62bf1cdce95b4aff365e5bd667a6cc391 )
Merged-In: Ie95d32418e5d16a10d3eeab462df857094b730c6
Change-Id: Ie95d32418e5d16a10d3eeab462df857094b730c6
2023-08-14 19:51:15 +00:00
Bassem Khalife
85067e5c12
Update bluejay SVN to 43
...
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:21f4d455ffc60571e424e50e8ffe64668a4e906d )
Merged-In: Iccee70454c4849fa84a84f915be432971af9404b
Change-Id: Iccee70454c4849fa84a84f915be432971af9404b
2023-08-14 19:51:06 +00:00
Android Build Coastguard Worker
ca1a45f851
[coastguard skipped] Merge sparse cherrypicks from sparse-10644925-L98600000962542387 into udc-release.
...
COASTGUARD_SKIP: Ifaab724207e354e44df14dc513218a637cf40ec7
COASTGUARD_SKIP: Iccee70454c4849fa84a84f915be432971af9404b
Change-Id: Ia61a8e3627a83c02682fe5ec5baf6e6185a88662
2023-08-12 00:48:17 +00:00
Android Build Coastguard Worker
231d1b58ad
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24392813'] into sparse-10644925-L98600000962542387.
...
SPARSE_CHANGE: Iccee70454c4849fa84a84f915be432971af9404b
Change-Id: Ifaab724207e354e44df14dc513218a637cf40ec7
2023-08-12 00:44:06 +00:00
Bassem Khalife
cbc7228875
Update bluejay SVN to 43
...
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:21f4d455ffc60571e424e50e8ffe64668a4e906d )
Merged-In: Iccee70454c4849fa84a84f915be432971af9404b
Change-Id: Iccee70454c4849fa84a84f915be432971af9404b
2023-08-12 00:43:10 +00:00
Bassem Khalife
f146a12e58
Update bluejay SVN to 45 am: 3d9216ab4a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24407407
Change-Id: I0e819abdf84525d9ebd1f31b4efd99148e4181fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-11 23:29:45 +00:00
Bassem Khalife
caf9176e91
Update bluejay SVN to 44 am: 71b17bb62b
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24405206
Change-Id: Iebd4b7aaffe6c7192d714dcd9b48ff34ecc147b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-11 22:04:29 +00:00
Bassem Khalife
3d9216ab4a
Update bluejay SVN to 45
...
Bug: 289414927
Change-Id: I5e7ecc45c732b5711d076b1e5783355a07c92846
2023-08-11 21:02:31 +00:00
Bassem Khalife
71b17bb62b
Update bluejay SVN to 44
...
Bug: 289414927
Change-Id: Ie95d32418e5d16a10d3eeab462df857094b730c6
2023-08-11 19:42:19 +00:00
Bassem Khalife
d2e21097b3
Update bluejay SVN to 43 am: 21f4d455ff
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24392813
Change-Id: I5c2a9020d760cadd1aeb5a39c866d8962709e5fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-10 20:16:53 +00:00
Bassem Khalife
21f4d455ff
Update bluejay SVN to 43
...
Bug: 289414927
Change-Id: Iccee70454c4849fa84a84f915be432971af9404b
2023-08-10 17:39:47 +00:00
Edwin Tung
6ce7ba9e0b
gps: Disable Vzw SUPL OTDOA
...
Bug: 293213801
Test: OTDOA disabled
Change-Id: I048fb789e143e975cfc54765ad220ad9ed248c2e
2023-07-27 13:43:01 +08:00
Bill Yi
2e786881f9
[automerger skipped] Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE am: fa9ca262c2
-s ours am: 93ee4357c7
-s ours am: 14c0850f74
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2654238
Change-Id: Iae18e0b5b50dad4e1c97cbdaffd7c3fe0a8ae051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 17:21:22 +00:00
Bill Yi
14c0850f74
[automerger skipped] Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE am: fa9ca262c2
-s ours am: 93ee4357c7
-s ours
...
am skip reason: Merged-In I7c78e791aa1b29ac80d8285a58ce06ddc09cc573 with SHA-1 b4a4abfd8a
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2654238
Change-Id: I5c3e7c2bafad5b5e59dfb7116991516f4d444284
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 14:51:37 +00:00
Bill Yi
93ee4357c7
[automerger skipped] Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE am: fa9ca262c2
-s ours
...
am skip reason: Merged-In I7c78e791aa1b29ac80d8285a58ce06ddc09cc573 with SHA-1 b4a4abfd8a
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2654238
Change-Id: Ib66f1a292d6b6ecd0ba89aee3bdb2f67c04c17af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 14:10:26 +00:00
Bill Yi
fa9ca262c2
Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE
...
Merged-In: I7c78e791aa1b29ac80d8285a58ce06ddc09cc573
Merged-In: I8a7c335914e0aad8b10a3a238e7ba719fe3019fe
Merged-In: I20686d1b36061692f9e0a458de945e60763e20e7
Change-Id: I96b80ae6f68143b7be094b18954dd2a98352c901
2023-07-11 15:27:13 -07:00
Bassem Khalife
7d4f75081a
Update bluejay SVN to 42 am: fb0f5bffce
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23864761
Change-Id: I20686d1b36061692f9e0a458de945e60763e20e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 04:16:52 +00:00
Android Build Coastguard Worker
2c57e83b1c
Merge cherrypicks of ['googleplex-android-review.googlesource.com/23809847', 'googleplex-android-review.googlesource.com/23864761'] into udc-release.
...
Change-Id: Ib867e368928a55165608504e58eca8e11cb61310
2023-06-30 03:19:47 +00:00
Bassem Khalife
aa6d68978a
Update bluejay SVN to 42
...
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:fb0f5bffceaced690714728c6a0cfe8d85ae1d9e )
Merged-In: I11e9a8368b21216481ba34fdde427a7ed398acbc
Change-Id: I11e9a8368b21216481ba34fdde427a7ed398acbc
2023-06-30 03:14:06 +00:00
Lokesh Kumar Goel
a97531e83b
Update bluejay SVN to 41
...
Bug: 285692955
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ac330e38bf5b1b1228021dd4f6ec2b1ddccaa99d )
Merged-In: Ia8f9db8eb23134db3eef2c7354da1f7ec3946f51
Change-Id: Ia8f9db8eb23134db3eef2c7354da1f7ec3946f51
2023-06-30 03:14:01 +00:00
Bassem Khalife
fb0f5bffce
Update bluejay SVN to 42
...
Bug: 289414927
Change-Id: I11e9a8368b21216481ba34fdde427a7ed398acbc
2023-06-30 02:01:45 +00:00
Xin Li
90c9ee57a9
[automerger skipped] Merge Android 13 QPR3 am: 57474b8846
-s ours am: b4a4abfd8a
-s ours am: 1d7f12def0
-s ours
...
am skip reason: Merged-In Ie5ec5ebbf9b25dd6e83ec66aa0b0d869f484fd01 with SHA-1 a87770cca5
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2635392
Change-Id: I1a9cb512da90ddd30ef975763b73c58d161e24ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 00:32:45 +00:00
Xin Li
1d7f12def0
[automerger skipped] Merge Android 13 QPR3 am: 57474b8846
-s ours am: b4a4abfd8a
-s ours
...
am skip reason: Merged-In Ie5ec5ebbf9b25dd6e83ec66aa0b0d869f484fd01 with SHA-1 a87770cca5
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2635392
Change-Id: I8a7c335914e0aad8b10a3a238e7ba719fe3019fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 23:10:37 +00:00
Xin Li
b4a4abfd8a
[automerger skipped] Merge Android 13 QPR3 am: 57474b8846
-s ours
...
am skip reason: Merged-In Ie5ec5ebbf9b25dd6e83ec66aa0b0d869f484fd01 with SHA-1 a87770cca5
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2635392
Change-Id: I7c78e791aa1b29ac80d8285a58ce06ddc09cc573
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 22:57:52 +00:00
Automerger Merge Worker
f4918084ff
Merge "Update bluejay SVN to 41 am: ac330e38bf
am: 4dba405581
" into udc-dev-plus-aosp
2023-06-26 22:42:12 +00:00
Lokesh Kumar Goel
ee5875247e
Update bluejay SVN to 41 am: ac330e38bf
am: 4dba405581
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23809847
Change-Id: Ie8865123089e53e6230c33c9d7606dc360f23b92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 22:42:09 +00:00
Lokesh Kumar Goel
4704617092
Update bluejay SVN to 41 am: ac330e38bf
am: 1f5e90806b
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23809847
Change-Id: I694e1043c3890bc9a81fdcdfa0bf9821012c4993
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 22:42:07 +00:00
Lokesh Kumar Goel
1f5e90806b
Update bluejay SVN to 41 am: ac330e38bf
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23809847
Change-Id: I0d3558224da18aa6b0eda46b76635c7db7c964cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 21:31:51 +00:00
Lokesh Kumar Goel
4dba405581
Update bluejay SVN to 41 am: ac330e38bf
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23809847
Change-Id: Ic5cefe2cca6b33a4e067a8901946369823673f41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 21:31:04 +00:00
Lokesh Kumar Goel
ac330e38bf
Update bluejay SVN to 41
...
Bug: 285692955
Change-Id: Ia8f9db8eb23134db3eef2c7354da1f7ec3946f51
2023-06-26 01:19:54 +00:00
Xin Li
57474b8846
Merge Android 13 QPR3
...
Bug: 275386652
Merged-In: Ie5ec5ebbf9b25dd6e83ec66aa0b0d869f484fd01
Change-Id: Icf715d66021bec4741c86bf3793b2c5d9beaf254
2023-06-21 15:14:32 -07:00
Android Build Coastguard Worker
3751860a59
Snap for 10322758 from 1690c6ee26
to udc-release
...
Change-Id: I433e20cb10920bf19c65ab42d9a19514fcdcf713
2023-06-14 23:02:01 +00:00