Greg Kaiser
c4c78a25d6
[automerger skipped] Fix lunch choices for git_main am: bb35cfaea7
am: d03c28f14c
-s ours
...
am skip reason: Merged-In I47590aaf84bd2481d53c04889c2963e02b7a816d with SHA-1 bb35cfaea7
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2809994
Change-Id: I22b57a1a473c16929efa7aee1821866ca141a854
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 17:50:05 +00:00
Greg Kaiser
d90d14358e
Fix lunch choices for git_main am: bb35cfaea7
am: b4bbe177a3
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2809994
Change-Id: I1a99fd05a2269f6efe66a41f5e16af62f899832b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 17:48:16 +00:00
Greg Kaiser
d03c28f14c
Fix lunch choices for git_main am: bb35cfaea7
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2809994
Change-Id: I5c7ecc1115e20a1a9ecc512f6b1212f27623ebf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 17:23:43 +00:00
Greg Kaiser
b4bbe177a3
Fix lunch choices for git_main am: bb35cfaea7
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2809994
Change-Id: I267fba100cf2500f834952fc212b680c12e8cdee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 17:22:04 +00:00
Greg Kaiser
bb35cfaea7
Fix lunch choices for git_main
...
We add "trunk_staging-" for all COMMON_LUNCH_CHOICES so they are
valid in the trunk stable setup.
Bug: 307738446
Test: lunch
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c0159563f3835c858d6587bebcbd87d123113530 )
Merged-In: I47590aaf84bd2481d53c04889c2963e02b7a816d
Change-Id: I47590aaf84bd2481d53c04889c2963e02b7a816d
2023-10-30 16:41:50 +00:00
Treehugger Robot
1be98cb13f
Merge "Update bluejay SVN to 52" into udc-qpr-dev am: e738f3743c
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25176278
Change-Id: I60aa12faacc60ad2249c00821e1055cf735c343f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 02:18:44 +00:00
Treehugger Robot
e738f3743c
Merge "Update bluejay SVN to 52" into udc-qpr-dev
2023-10-27 01:50:02 +00:00
Treehugger Robot
0435ed76ad
Merge " Adding Fast Pair extended IDs for Pixel 6a" into udc-qpr-dev am: 8a9f1ae07a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25069787
Change-Id: I20be0837399458d0c7c08270e5963f0215c81e77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 23:21:25 +00:00
Treehugger Robot
8a9f1ae07a
Merge " Adding Fast Pair extended IDs for Pixel 6a" into udc-qpr-dev
2023-10-26 22:55:38 +00:00
Lokesh Kumar Goel
ee9f7982a8
Update bluejay SVN to 51 am: d81b0b63f1
am: 4a915db3d6
am: fa413e9e5a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25177019
Change-Id: Iddd0eff9458b2236ccf4a13952fc4a1d91bf9c9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:55:29 +00:00
Lokesh Kumar Goel
7a87d5e4f9
[automerger skipped] Update bluejay SVN to 50 am: d92f98af41
am: 99b6c8f2d0
-s ours am: aa63eb3e2e
-s ours
...
am skip reason: skipped by user lokeshgoel
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25175978
Change-Id: Ie55daae61aa2b29a2dc73b55ee200782b0e51056
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:54:58 +00:00
Lokesh Kumar Goel
bd863791db
Update bluejay SVN to 51 am: d81b0b63f1
am: 324dad2794
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25177019
Change-Id: I41fa243c7fd2491c6692a6e00e0dd17d9b977b2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:33:15 +00:00
Lokesh Kumar Goel
66e4f34a48
[automerger skipped] Update bluejay SVN to 50 am: d92f98af41
am: 7f7d1b1bc2
-s ours
...
am skip reason: skipped by user lokeshgoel
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25175978
Change-Id: I5e741dc483fee71d8005cdbc71c408cd28f5db30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:32:36 +00:00
Lokesh Kumar Goel
fa413e9e5a
Update bluejay SVN to 51 am: d81b0b63f1
am: 4a915db3d6
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25177019
Change-Id: Ie6427c613eb503ac94a5e49b783864d7eaaabbf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:24:39 +00:00
Lokesh Kumar Goel
aa63eb3e2e
[automerger skipped] Update bluejay SVN to 50 am: d92f98af41
am: 99b6c8f2d0
-s ours
...
am skip reason: skipped by user lokeshgoel
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25175978
Change-Id: Ibf25fd9af65911e05c08d893480b500b8908ff54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:24:01 +00:00
Lokesh Kumar Goel
4a915db3d6
Update bluejay SVN to 51 am: d81b0b63f1
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25177019
Change-Id: Ib0d41ddf0a87e798419e91c43afdb12c031f8f08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:06:23 +00:00
Lokesh Kumar Goel
99b6c8f2d0
Update bluejay SVN to 50 am: d92f98af41
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25175978
Change-Id: I3d847205bf25f8b38fb86e0a269b7591185f2509
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:05:57 +00:00
Lokesh Kumar Goel
324dad2794
Update bluejay SVN to 51 am: d81b0b63f1
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25177019
Change-Id: I945bb62caacc7c0e039a1cb3ab703146c30537ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:03:52 +00:00
Lokesh Kumar Goel
7f7d1b1bc2
Update bluejay SVN to 50 am: d92f98af41
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25175978
Change-Id: I727199b7b6db757aab8dfceabd10efea737971ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:03:26 +00:00
Roshan Pius
4a406ef346
bluejay(nfc): Modify NFC overlays for NFC apex am: 37718485f2
am: 8594b545a4
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2804473
Change-Id: I2bcb514875e5d3c550b79c80c4161aee75e9bae0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 14:58:36 +00:00
Roshan Pius
f77dc2de58
bluejay(nfc): Modify NFC overlays for NFC apex am: 37718485f2
am: bb6c74b55e
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2804473
Change-Id: I85b56ea22c5e247f40d47d7b7e210411b118cda4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 14:57:10 +00:00
Roshan Pius
8594b545a4
bluejay(nfc): Modify NFC overlays for NFC apex am: 37718485f2
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2804473
Change-Id: Id1220d4fcd9dbfd9797e6ffcd7e1687cc0259366
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 14:35:53 +00:00
Roshan Pius
bb6c74b55e
bluejay(nfc): Modify NFC overlays for NFC apex am: 37718485f2
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2804473
Change-Id: Ie270077019a977d62b50c2cd855eecefc2b18901
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 14:33:57 +00:00
Ankur Bakshi
8f9b6dbaaa
Update bluejay SVN to 52
...
Bug: 302612466
Change-Id: I403e87cf5943f5c45d6d0db99a3e15018064067a
2023-10-26 05:11:06 +00:00
Roshan Pius
37718485f2
bluejay(nfc): Modify NFC overlays for NFC apex
...
Bug: 307763519
Test: Manual flash and tested the overlay values are taking effect.
Change-Id: Ia8787c18a6eb3ff932a783cfcde6380f9937cd59
2023-10-25 14:06:47 -07:00
Lokesh Kumar Goel
abc5777051
Update bluejay SVN to 51 am: be1d0f6c38
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24895584
Change-Id: I426896ab3c85723d1cced3958c7f5b7b78845e8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 20:43:00 +00:00
Lokesh Kumar Goel
d81b0b63f1
Update bluejay SVN to 51
...
Bug: 302612466
Change-Id: If8f16626a5e13f98e81ff0833a60888efe9cddcd
2023-10-25 20:23:42 +00:00
Lokesh Kumar Goel
d92f98af41
Update bluejay SVN to 50
...
Bug: 302612466
Change-Id: I7393253ef50c9b1da0f683ffcdd9cd191c8ab1f6
2023-10-25 19:47:19 +00:00
Xin Li
27cc067aac
[automerger skipped] Merge 10952656 am: 24cba1b02d
-s ours
...
am skip reason: Merged-In I21193dd2a51d86c0c5ed04d48c188f906557be7c with SHA-1 2c840cedbf
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25089492
Change-Id: Ib20640381054bba1fb00c6c5484b12fc5b5f7652
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 18:48:01 +00:00
Xin Li
24cba1b02d
Merge 10952656
...
Merged-In: I21193dd2a51d86c0c5ed04d48c188f906557be7c
Change-Id: Iffafbf45335d4af3635be599badc69f765b1320d
2023-10-17 10:05:54 -07:00
Roshan Pius
76a30c7050
Merge "bluejay: Replace NFC app with NFC apex" into main am: 1c66031b9e
am: 35abd35c39
am: b1644a944c
am: 82bdbb3751
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2779508
Change-Id: Id35526ef528b708275d89319520e43f6f2688f1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 20:49:15 +00:00
Shivakumar Neginal
648307e16f
Adding Fast Pair extended IDs for Pixel 6a
...
Adding the Fast Pair extended IDs for bluejay so that
Quick Start shows the right Fast Pair bottom sheet on other devices
during setup.
Bug: 305516133
Test: TBD
Change-Id: I852842706664902dc3a76175810ebf869439796d
2023-10-16 20:22:17 +00:00
Roshan Pius
82bdbb3751
Merge "bluejay: Replace NFC app with NFC apex" into main am: 1c66031b9e
am: 35abd35c39
am: b1644a944c
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2779508
Change-Id: I66fe9f2e337614fc296d4c1b02c490e43a3f78ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 20:13:12 +00:00
Roshan Pius
b1644a944c
Merge "bluejay: Replace NFC app with NFC apex" into main am: 1c66031b9e
am: 35abd35c39
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2779508
Change-Id: I3fcabe68c78d3b00a3baf38c2c9e1b1ecfb807dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 19:38:21 +00:00
Roshan Pius
35abd35c39
Merge "bluejay: Replace NFC app with NFC apex" into main am: 1c66031b9e
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2779508
Change-Id: I5f99bd729fd6f34e867076d9be9e660b12f10809
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 19:15:57 +00:00
Roshan Pius
1c66031b9e
Merge "bluejay: Replace NFC app with NFC apex" into main
2023-10-16 18:31:03 +00:00
Lokesh Kumar Goel
10346ce553
Update bluejay SVN to 50 am: 9b309d763a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24895526
Change-Id: Id4737296e1311fac016e08350c1ca0201ee8c891
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 05:04:26 +00:00
Roshan Pius
f67025292b
bluejay: Replace NFC app with NFC apex
...
Bug: 303286040
Test: Compiles
Merged-In: Ief6317a97f4c0208e506afc17ed6ab37e81d2db1
Change-Id: Ief6317a97f4c0208e506afc17ed6ab37e81d2db1
2023-10-13 18:03:57 +00:00
Xin Li
2c840cedbf
[automerger skipped] Merge Android 14 am: 27a7db0162
-s ours am: b99740f973
-s ours am: 53d5d3e010
-s ours am: 5144fcfb74
-s ours
...
am skip reason: Merged-In Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3 with SHA-1 0ea630f587
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2775835
Change-Id: I21193dd2a51d86c0c5ed04d48c188f906557be7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 11:00:21 +00:00
Xin Li
5144fcfb74
[automerger skipped] Merge Android 14 am: 27a7db0162
-s ours am: b99740f973
-s ours am: 53d5d3e010
-s ours
...
am skip reason: Merged-In Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3 with SHA-1 0ea630f587
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2775835
Change-Id: I4d0f567451d80160a5db8595f2e9151393bfdda9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 09:50:31 +00:00
Xin Li
53d5d3e010
[automerger skipped] Merge Android 14 am: 27a7db0162
-s ours am: b99740f973
-s ours
...
am skip reason: Merged-In Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3 with SHA-1 0ea630f587
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2775835
Change-Id: Iaf4888b74fd9817762fe4cf0d3b3d372c8affd9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 08:58:56 +00:00
Xin Li
b99740f973
[automerger skipped] Merge Android 14 am: 27a7db0162
-s ours
...
am skip reason: Merged-In Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3 with SHA-1 0ea630f587
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2775835
Change-Id: I7882c11a29328f5077626b90364f28562b969df2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 07:51:50 +00:00
Xin Li
27a7db0162
Merge Android 14
...
Bug: 298295554
Merged-In: Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3
Change-Id: I9a5965085ad017c52637497f38e34100e039c8cd
2023-10-05 15:32:08 -07:00
Xin Li
d37e5b4997
[automerger skipped] Merge UP1A.231005.007 am: 856bb61b7d
-s ours am: a3e430e4e4
-s ours am: 02f8503d75
-s ours
...
am skip reason: Merged-In Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3 with SHA-1 d0c9858ecd
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24879335
Change-Id: I8c9d882b30602d25257dbc775dcc7dd80d86ac86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 09:04:35 +00:00
Xin Li
02f8503d75
[automerger skipped] Merge UP1A.231005.007 am: 856bb61b7d
-s ours am: a3e430e4e4
-s ours
...
am skip reason: Merged-In Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3 with SHA-1 d0c9858ecd
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24879335
Change-Id: I8fb5873e56341a2de110c601454e3377a9b0852d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 08:16:32 +00:00
Xin Li
a3e430e4e4
[automerger skipped] Merge UP1A.231005.007 am: 856bb61b7d
-s ours
...
am skip reason: Merged-In Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3 with SHA-1 d0c9858ecd
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24879335
Change-Id: I0ef2a99b0d9876400a0c992206a19f54ce99a738
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 07:15:42 +00:00
Lokesh Kumar Goel
be1d0f6c38
Update bluejay SVN to 51
...
Bug: 302612466
Change-Id: If8f16626a5e13f98e81ff0833a60888efe9cddcd
2023-09-29 01:15:32 +00:00
Lokesh Kumar Goel
9b309d763a
Update bluejay SVN to 50
...
Bug: 302612466
Change-Id: I7393253ef50c9b1da0f683ffcdd9cd191c8ab1f6
2023-09-29 01:13:58 +00:00
Xin Li
856bb61b7d
Merge UP1A.231005.007
...
Bug: 291102124
Merged-In: Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3
Change-Id: I2082f1cf1b4b9e607ff710b223552f66babbb122
2023-09-27 16:04:11 -07:00
Rick Yiu
ab6c5825c6
Disable limiting camera_hal for LAUNCH hint am: dba182188e
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24798149
Change-Id: I7a35549201eaa230c65cfef3b3d15985ba130a76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 07:57:37 +00:00