Roshan Pius
efb33b30b4
Merge "lynx: Replace NFC app with NFC apex" into main am: 86e259c1c0
am: e22afc3211
am: 399ffed584
...
Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2779827
Change-Id: I64548363121ba4373f0cd8c3294e8646984cf432
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 20:13:08 +00:00
Roshan Pius
399ffed584
Merge "lynx: Replace NFC app with NFC apex" into main am: 86e259c1c0
am: e22afc3211
...
Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2779827
Change-Id: Ic06d1207cbb9554a0cef163bbb02d7b33533f911
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 19:38:17 +00:00
Roshan Pius
e22afc3211
Merge "lynx: Replace NFC app with NFC apex" into main am: 86e259c1c0
...
Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2779827
Change-Id: I09a2476d33171162855086aac4f9545bce4eb7d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 19:15:54 +00:00
Roshan Pius
86e259c1c0
Merge "lynx: Replace NFC app with NFC apex" into main
2023-10-16 18:31:03 +00:00
Roshan Pius
22ea3c2b4e
lynx: Replace NFC app with NFC apex
...
Bug: 303286040
Test: Compiles
Merged-In: Id85d62a10589765dffa293770bca9d0906eb2973
Change-Id: Id85d62a10589765dffa293770bca9d0906eb2973
2023-10-13 18:05:28 +00:00
Xin Li
b1b596fc63
[automerger skipped] Merge Android 14 am: 4587235724
-s ours am: 60247ee0cb
-s ours am: cfdbe750ee
-s ours
...
am skip reason: Merged-In Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e with SHA-1 f34a869306
is already in history
Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2776402
Change-Id: Ie42d5c503fdd0bd50c715ab2c2147fc5e5f41f29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 09:50:22 +00:00
Xin Li
cfdbe750ee
[automerger skipped] Merge Android 14 am: 4587235724
-s ours am: 60247ee0cb
-s ours
...
am skip reason: Merged-In Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e with SHA-1 f34a869306
is already in history
Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2776402
Change-Id: Ib7766173776561b2f435a55b637d80a428935cb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 08:58:43 +00:00
Xin Li
60247ee0cb
[automerger skipped] Merge Android 14 am: 4587235724
-s ours
...
am skip reason: Merged-In Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e with SHA-1 f34a869306
is already in history
Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2776402
Change-Id: Ibca60d516795ac9d468ce11621d1c9ac186d7deb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 07:51:41 +00:00
Xin Li
4587235724
Merge Android 14
...
Bug: 298295554
Merged-In: Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e
Change-Id: I9c3c689e4ccc3d156a50452ceeed2801cdf68254
2023-10-05 15:33:42 -07:00
Xin Li
0536133bb2
[automerger skipped] Merge UP1A.231005.007 am: 682a3bd546
-s ours am: 183e4ee15e
-s ours
...
am skip reason: Merged-In Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e with SHA-1 75f1a483a6
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24878886
Change-Id: I4b68d7580ebd580adfeb1820c7bc392da194b784
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 08:16:27 +00:00
Xin Li
183e4ee15e
[automerger skipped] Merge UP1A.231005.007 am: 682a3bd546
-s ours
...
am skip reason: Merged-In Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e with SHA-1 75f1a483a6
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24878886
Change-Id: I33082f08959ff037e455e386fae894ef2a53c380
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 07:15:38 +00:00
Xin Li
682a3bd546
Merge UP1A.231005.007
...
Bug: 291102124
Merged-In: Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e
Change-Id: If0cb0cf81edabfd491128f6fe95f39e2678397ff
2023-09-27 16:04:23 -07:00
Ankur Bakshi
9137731141
Update lynx SVN to 19 am: 2b2fdad817
am: 9befc027fe
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24699139
Change-Id: I22e00498bbb0da73f0d6cfc78ecfc183af1ff50c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 19:47:30 +00:00
Ankur Bakshi
0eea643d1b
Update lynx SVN to 18 am: 9909067723
am: b0128e5e9e
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24687081
Change-Id: Ica88027fa8bb3fa862dcada2ec9c1ce742d1ef8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 19:47:28 +00:00
Ankur Bakshi
455b93402b
Update lynx SVN to 19 am: 2b2fdad817
am: 746df61329
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24699139
Change-Id: Idb46187c9e52ad113ca6ce303cf19944edd1c994
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 19:47:06 +00:00
Ankur Bakshi
8b2180134e
Update lynx SVN to 18 am: 9909067723
am: 0ba105017e
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24687081
Change-Id: Idae292c43b0d205cdcad5680941775ba15f28841
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 19:47:03 +00:00
Ankur Bakshi
9befc027fe
Update lynx SVN to 19 am: 2b2fdad817
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24699139
Change-Id: I740d8ffc2214c3e2f72f5294e2148891388a03c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:53:59 +00:00
Ankur Bakshi
b0128e5e9e
Update lynx SVN to 18 am: 9909067723
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24687081
Change-Id: I0f0f6e6d12cb2280d2db633485df036ad0f36ec6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:53:56 +00:00
Ankur Bakshi
746df61329
Update lynx SVN to 19 am: 2b2fdad817
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24699139
Change-Id: I9183e8a04c9d50afb8625b7141af79cf714490c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:51:18 +00:00
Ankur Bakshi
0ba105017e
Update lynx SVN to 18 am: 9909067723
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24687081
Change-Id: I9d22503d3178dec3fecc2679a04d7da80fc8e55c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:51:16 +00:00
Ankur Bakshi
2b2fdad817
Update lynx SVN to 19
...
Bug: 298087649
Change-Id: I370515ae8b4f972059a8af4625dc55a052bb7348
2023-09-08 01:29:57 +00:00
Ankur Bakshi
9909067723
Update lynx SVN to 18
...
Bug: 298087649
Change-Id: Iadd6e0f8767cc8acfa0040b43190b3f2b35320de
2023-09-07 05:15:57 +00:00
Xin Li
aeeeaa2cfc
[automerger skipped] Merge UP1A.230905.019 am: 0ea3181c68
-s ours am: 6fb6425739
-s ours
...
am skip reason: Merged-In I8981f42c3b0b8ba9e5246c0aaedaafc5d7bfe71a with SHA-1 298ba980a2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24625328
Change-Id: Ibafa2a8a3b36048761189468cb7c335f24995782
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 20:34:35 +00:00
Xin Li
6fb6425739
[automerger skipped] Merge UP1A.230905.019 am: 0ea3181c68
-s ours
...
am skip reason: Merged-In I8981f42c3b0b8ba9e5246c0aaedaafc5d7bfe71a with SHA-1 298ba980a2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24625328
Change-Id: I8e9fd6f8959079f2a0747933881d59e3e555b044
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 19:45:20 +00:00
Xin Li
0ea3181c68
Merge UP1A.230905.019
...
Merged-In: I8981f42c3b0b8ba9e5246c0aaedaafc5d7bfe71a
Change-Id: If1749b939311c7fc68e40a3ef783afaf19a49f9d
2023-08-31 12:16:21 -07:00
Android Build Coastguard Worker
03fb5d8f95
[coastguard skipped] Merge sparse cherrypicks from sparse-10740638-L17800000962853027 into udc-release.
...
COASTGUARD_SKIP: Ief4eef8046b44c07f285bdf4ad4b9ffdd0e8d5fc
COASTGUARD_SKIP: Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e
Change-Id: I77002331c8429dad362325978e66378a1969d2c3
2023-08-30 23:17:06 +00:00
Android Build Coastguard Worker
311a1c7b9d
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24436879'] into sparse-10740638-L17800000962853027.
...
SPARSE_CHANGE: Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e
Change-Id: Ief4eef8046b44c07f285bdf4ad4b9ffdd0e8d5fc
2023-08-30 23:10:25 +00:00
Lokesh Kumar Goel
f34a869306
Update lynx SVN to 17
...
Bug: 295937899
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:75f1a483a673e7946fdeda74700feb74a771669e )
Merged-In: Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e
Change-Id: Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e
2023-08-30 23:08:40 +00:00
Android Build Coastguard Worker
3ea2975813
[coastguard skipped] Merge sparse cherrypicks from sparse-10739010-L93800000962847818 into udc-release.
...
COASTGUARD_SKIP: Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e
COASTGUARD_SKIP: I66a4ee4a70bd094c19276656b4a888d44800f1d2
Change-Id: I94871f92c9785cf89903b0e27218e1745f0b70e9
2023-08-30 18:57:34 +00:00
Android Build Coastguard Worker
659adedcf9
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24436879'] into sparse-10739010-L93800000962847818.
...
SPARSE_CHANGE: Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e
Change-Id: I66a4ee4a70bd094c19276656b4a888d44800f1d2
2023-08-30 18:50:49 +00:00
Lokesh Kumar Goel
bff662971b
Update lynx SVN to 17
...
Bug: 295937899
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:75f1a483a673e7946fdeda74700feb74a771669e )
Merged-In: Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e
Change-Id: Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e
2023-08-30 18:48:49 +00:00
Treehugger Robot
e24a33ee33
Merge "Add aosp_lynx_hwasan" into main am: 0b5d4d46e5
am: bb37ea6bc8
am: 571ccf7054
...
Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2729356
Change-Id: Ic2114320f2e88e34e4dda4f40037326c050e47c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 01:12:17 +00:00
Xin Li
06ddcb7c1a
[automerger skipped] Merge Android U (ab/10368041) am: 166f497a25
-s ours am: 639c581144
-s ours
...
am skip reason: Merged-In I9b1a81a02662ec49f24235f995c1503f60a5b492 with SHA-1 1402f63109
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24181797
Change-Id: I68ddd4411422ea6894a8e81d1d8c708d34232f9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 00:34:49 +00:00
Treehugger Robot
571ccf7054
Merge "Add aosp_lynx_hwasan" into main am: 0b5d4d46e5
am: bb37ea6bc8
...
Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2729356
Change-Id: I3a8151092c91d7ef2bf7670dddd94851a48a6c38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 00:28:01 +00:00
Xin Li
639c581144
[automerger skipped] Merge Android U (ab/10368041) am: 166f497a25
-s ours
...
am skip reason: Merged-In I9b1a81a02662ec49f24235f995c1503f60a5b492 with SHA-1 1402f63109
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24181797
Change-Id: I6453748db5d3df4e14049283d661238d5f1af476
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 23:58:49 +00:00
Treehugger Robot
bb37ea6bc8
Merge "Add aosp_lynx_hwasan" into main am: 0b5d4d46e5
...
Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2729356
Change-Id: Ie4b1fff5fc00861b0a8d728fb8f7b5c5fa6ca8d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 22:53:37 +00:00
Treehugger Robot
0b5d4d46e5
Merge "Add aosp_lynx_hwasan" into main
2023-08-28 21:23:28 +00:00
Florian Mayer
2c87b60f23
Add aosp_lynx_hwasan
...
Bug: 297918380
Change-Id: I0dfd9d498a0a989355ca76d561fa267d41e1cd3b
2023-08-28 13:11:18 -07:00
Android Build Coastguard Worker
a6d19ce5be
[coastguard skipped] Merge sparse cherrypicks from sparse-10705648-L70200000962736881 into udc-release.
...
COASTGUARD_SKIP: I6a80d52712b561d866f67066ccbf54286a350e24
COASTGUARD_SKIP: Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e
Change-Id: I7cf8726b03467a7a33933df4e7275efc61925007
2023-08-23 23:45:51 +00:00
Android Build Coastguard Worker
be35192482
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24436879'] into sparse-10705648-L70200000962736881.
...
SPARSE_CHANGE: Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e
Change-Id: I6a80d52712b561d866f67066ccbf54286a350e24
2023-08-23 23:40:41 +00:00
Lokesh Kumar Goel
e62accf521
Update lynx SVN to 17
...
Bug: 295937899
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:75f1a483a673e7946fdeda74700feb74a771669e )
Merged-In: Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e
Change-Id: Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e
2023-08-23 23:39:10 +00:00
Android Build Coastguard Worker
5714496e8f
[coastguard skipped] Merge sparse cherrypicks from sparse-10696112-L14300000962710292 into udc-release.
...
COASTGUARD_SKIP: I701b59642efa871f8902794ccc6ac865b1a829ea
COASTGUARD_SKIP: Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e
Change-Id: I939968a84909761642b77cc8c747f2010821b6ae
2023-08-22 21:17:11 +00:00
Android Build Coastguard Worker
2266c2d625
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24436879'] into sparse-10696112-L14300000962710292.
...
SPARSE_CHANGE: Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e
Change-Id: I701b59642efa871f8902794ccc6ac865b1a829ea
2023-08-22 21:11:21 +00:00
Lokesh Kumar Goel
9f9b5e4b40
Update lynx SVN to 17
...
Bug: 295937899
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:75f1a483a673e7946fdeda74700feb74a771669e )
Merged-In: Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e
Change-Id: Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e
2023-08-22 21:09:38 +00:00
Android Build Coastguard Worker
84654460fb
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24392319', 'googleplex-android-review.googlesource.com/24425770', 'googleplex-android-review.googlesource.com/24210868'] into udc-release.
...
Change-Id: I5626f91945e628e2d2086d30ae6bae9db4267f3c
2023-08-22 02:18:57 +00:00
Edwin Tung
17bb9133e0
gps: Disable Vzw SUPL OTDOA
...
Bug: 293213801
Test: OTDOA disabled
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7a3b1491fe6cf7d70a641d3f0e4fb7e7f816e22f )
Merged-In: If504f67da0640634ff30379a14af4e15f062fefa
Change-Id: If504f67da0640634ff30379a14af4e15f062fefa
2023-08-22 02:08:20 +00:00
Lokesh Kumar Goel
65490d791d
Update lynx SVN to 16
...
Bug: 295937899
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:cd45a63aaffa3c0dc714b9d51d1727cca682dbc6 )
Merged-In: Icb163819116e61292429a2c1c362d40649a6f7e8
Change-Id: Icb163819116e61292429a2c1c362d40649a6f7e8
2023-08-22 02:08:12 +00:00
Bassem Khalife
926a265425
Update lynx SVN to 15
...
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:298ba980a2bfcc3b0628cee69670f2c3e35f626b )
Merged-In: I8981f42c3b0b8ba9e5246c0aaedaafc5d7bfe71a
Change-Id: I8981f42c3b0b8ba9e5246c0aaedaafc5d7bfe71a
2023-08-22 02:08:04 +00:00
Edwin Tung
902148ab45
gps: Disable Vzw SUPL OTDOA am: 7a3b1491fe
am: ac5d811cf8
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24210868
Change-Id: I00d65da9fadd3c05b3796b6e959f20c77951e22a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 23:24:21 +00:00
Edwin Tung
aa5b9eb9f2
gps: Disable Vzw SUPL OTDOA am: 7a3b1491fe
am: cd10c0c1f5
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24210868
Change-Id: I4ce180c44e9506f76cfc77f4739e448cd67f9491
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 22:52:12 +00:00