Lokesh Kumar Goel
2387becf45
[automerger skipped] Update felix SVN to 28 am: 8ad0e2cf93
am: 1a04115be1
-s ours am: b5a77f9e0e
-s ours am: dc93f0b997
-s ours
...
am skip reason: skipped by user lokeshgoel
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176953
Change-Id: If635830508be935ed8a2bcf4424287c11e386d78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 22:21:51 +00:00
Lokesh Kumar Goel
42591aa9ee
Update felix SVN to 29 am: 0c650e810d
am: d0e0bcb6a5
am: 9ac8802a3a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176955
Change-Id: I32b38322dcac178b920410ced48fea1a711fb922
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 22:19:41 +00:00
Lokesh Kumar Goel
f2a4e2c7f7
[automerger skipped] Update felix SVN to 28 am: 8ad0e2cf93
am: 446501afd9
-s ours am: 0dff87e435
-s ours
...
am skip reason: skipped by user lokeshgoel
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176953
Change-Id: I5eb3bbbf615d69ac927e54b95cef3766e552a373
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:56:37 +00:00
Lokesh Kumar Goel
dc93f0b997
[automerger skipped] Update felix SVN to 28 am: 8ad0e2cf93
am: 1a04115be1
-s ours am: b5a77f9e0e
-s ours
...
am skip reason: skipped by user lokeshgoel
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176953
Change-Id: Ic98a437f40559fbd717abdfa06c0fa11ce3ffafa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:54:57 +00:00
Lokesh Kumar Goel
9ac8802a3a
Update felix SVN to 29 am: 0c650e810d
am: d0e0bcb6a5
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176955
Change-Id: I04762a206bec1da5212c147a94cec0c69f756326
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:33:14 +00:00
Lokesh Kumar Goel
0dff87e435
[automerger skipped] Update felix SVN to 28 am: 8ad0e2cf93
am: 446501afd9
-s ours
...
am skip reason: skipped by user lokeshgoel
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176953
Change-Id: I5f22073a07063dd1f839f6d9e939e5f8bfb61a56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:32:35 +00:00
Lokesh Kumar Goel
b09aab5213
Update felix SVN to 29 am: 0c650e810d
am: 0d2a8a6942
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176955
Change-Id: Ie08b567f3e29befc220b71b6c6e283a451ad5be7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:29:52 +00:00
Lokesh Kumar Goel
e5d1aef0ca
[automerger skipped] Update felix SVN to 28 am: 8ad0e2cf93
am: 67a29b5bb5
-s ours
...
am skip reason: skipped by user lokeshgoel
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176953
Change-Id: I2542a2aeb9a3c3c8473445c348cb1840e26ca6a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:28:59 +00:00
Lokesh Kumar Goel
b5a77f9e0e
[automerger skipped] Update felix SVN to 28 am: 8ad0e2cf93
am: 1a04115be1
-s ours
...
am skip reason: skipped by user lokeshgoel
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176953
Change-Id: I5767a29210c88b93732ee40485e887b4af7b129e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:24:00 +00:00
Lokesh Kumar Goel
1a04115be1
Update felix SVN to 28 am: 8ad0e2cf93
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176953
Change-Id: I3b0fcc12c696fa5cd9dc9a24c920f5408daacb2f
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
0d2a8a6942
Update felix SVN to 29 am: 0c650e810d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176955
Change-Id: Ibee3ac7d7f77fe5a0fcb1fbcb70eedf77e89077e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:04:37 +00:00
Lokesh Kumar Goel
67a29b5bb5
Update felix SVN to 28 am: 8ad0e2cf93
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176953
Change-Id: I673c1f3597ded272c39ba245139107f458ac5658
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:04:07 +00:00
Lokesh Kumar Goel
d0e0bcb6a5
Update felix SVN to 29 am: 0c650e810d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176955
Change-Id: I0d1ff11bb8df3420779c97aba049991d2448cc6d
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
446501afd9
Update felix SVN to 28 am: 8ad0e2cf93
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176953
Change-Id: Iecdf4d01252fd905bfb2e31b953753d727d2bc0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:03:26 +00:00
Roshan Pius
98e8df30b7
felix(nfc): Modify NFC overlays for NFC apex am: 422f737c4b
am: fa6eb11ca3
am: 6dc47683b7
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2804475
Change-Id: I2055ba3a83701e572287820a508fb16f99bf5708
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 15:30:21 +00:00
Roshan Pius
f7dae2aa9d
felix(nfc): Modify NFC overlays for NFC apex am: 422f737c4b
am: 0d481cf369
am: 445c61a269
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2804475
Change-Id: I84a650d23e538b51152760d4d920f604b399208e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 15:29:06 +00:00
Roshan Pius
6dc47683b7
felix(nfc): Modify NFC overlays for NFC apex am: 422f737c4b
am: fa6eb11ca3
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2804475
Change-Id: I571df442ff7ad7e87134b63863e7b53a0517b88e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 14:58:35 +00:00
Roshan Pius
445c61a269
felix(nfc): Modify NFC overlays for NFC apex am: 422f737c4b
am: 0d481cf369
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2804475
Change-Id: Id71e1b49954336818bd05ab7bb78694ee5649257
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 14:57:08 +00:00
Roshan Pius
fa6eb11ca3
felix(nfc): Modify NFC overlays for NFC apex am: 422f737c4b
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2804475
Change-Id: Ia605f593c54e5942fa7d9a842dcdd1836614ca3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 14:35:52 +00:00
Roshan Pius
0d481cf369
felix(nfc): Modify NFC overlays for NFC apex am: 422f737c4b
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2804475
Change-Id: Ifc7551059829f274a7dd34e8a97e5975aeae61b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 14:33:56 +00:00
Roshan Pius
422f737c4b
felix(nfc): Modify NFC overlays for NFC apex
...
Bug: 307763519
Test: Manual flash and tested the overlay values are taking effect.
Change-Id: I4c02990bf44fb5f8de360572f1b15ae6f70520ff
2023-10-26 04:06:11 +00:00
Treehugger Robot
27f4abdff0
Merge "Fix lunch choices for git_main" into main
2023-10-25 23:44:17 +00:00
Greg Kaiser
2d13c2fd2b
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
Change-Id: I441fde351191dfa28e48a54538249be57310971f
2023-10-25 15:35:41 -06:00
Lokesh Kumar Goel
f88a11aeaa
Update felix SVN to 29 am: 348ba30559
am: 32587a4efe
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24896431
Change-Id: Icdbb09445f6fd18e697d40f4b9fc026b31265ec4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 21:10:05 +00:00
Lokesh Kumar Goel
32587a4efe
Update felix SVN to 29 am: 348ba30559
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24896431
Change-Id: Idd044f1fe6aa43b11dfcb0f35b783cadbd97cb7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 20:42:53 +00:00
Lokesh Kumar Goel
0c650e810d
Update felix SVN to 29
...
Bug: 302612466
Change-Id: Ia1f09da58824a8300e364bd3236fad0685ee5508
2023-10-25 20:29:36 +00:00
Lokesh Kumar Goel
8ad0e2cf93
Update felix SVN to 28
...
Bug: 302612466
Change-Id: If52eb638b160fd202e0511f6213fa5c5bce4975e
2023-10-25 19:47:19 +00:00
Treehugger Robot
70f71facd1
Merge "Update IDisplay to V10" into main
2023-10-24 02:40:50 +00:00
Cheng Chang
3cd8690bf5
gps: Enable Vzw SUPL OTDOA
...
Bug: 303401506
Test: OTDOA test in b/303401506
Change-Id: I53bce7feff22c39c5a787fda1be3218a0f51e4b1
2023-10-20 03:38:40 +00:00
Xin Li
548a10db7f
[automerger skipped] Merge 10952656 am: aca659d22b
-s ours am: 17abad99d1
-s ours
...
am skip reason: Merged-In I220f48a43df9002d783951055ecc0e07427c7afa with SHA-1 ab6e33ccea
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25093005
Change-Id: I91c3146f40c1ecfe7874d5870df7002c9bb567ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 23:54:33 +00:00
Xin Li
17abad99d1
[automerger skipped] Merge 10952656 am: aca659d22b
-s ours
...
am skip reason: Merged-In I220f48a43df9002d783951055ecc0e07427c7afa with SHA-1 ab6e33ccea
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25093005
Change-Id: I0ee4481c1a329fc2ceb3bba1f32a0dbc05ff13b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 18:47:47 +00:00
Xin Li
aca659d22b
Merge 10952656
...
Merged-In: I220f48a43df9002d783951055ecc0e07427c7afa
Change-Id: I05ee5b22c2850b609c38c88da98dfcaff66e128f
2023-10-17 10:06:18 -07:00
Roshan Pius
daf56acf59
[automerger skipped] Merge "felix: Replace NFC app with NFC apex" into main am: 996129be91
am: cda6224f59
am: 48ee029a6f
am: de798f7fd9
am: d2e0ca217b
-s ours
...
am skip reason: Merged-In I9ae8d7630d18075b8620997582761787af1a65b4 with SHA-1 19bacab2ca
is already in history
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2779568
Change-Id: I5f757dcfd8456a74fc6f30d01c48e9c4a1fe90b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 20:57:52 +00:00
Roshan Pius
d2e0ca217b
Merge "felix: Replace NFC app with NFC apex" into main am: 996129be91
am: cda6224f59
am: 48ee029a6f
am: de798f7fd9
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2779568
Change-Id: If6ec3a2b5344d42b0146dd3e8c91c8174a68419e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 20:49:12 +00:00
Roshan Pius
de798f7fd9
Merge "felix: Replace NFC app with NFC apex" into main am: 996129be91
am: cda6224f59
am: 48ee029a6f
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2779568
Change-Id: I49b935fc77091d1f868ea79bf69e16fee8e307b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 20:13:08 +00:00
Roshan Pius
48ee029a6f
Merge "felix: Replace NFC app with NFC apex" into main am: 996129be91
am: cda6224f59
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2779568
Change-Id: Ide3300b576b6a5d2f12829338ea914f76d18dc04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 19:38:17 +00:00
Roshan Pius
cda6224f59
Merge "felix: Replace NFC app with NFC apex" into main am: 996129be91
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2779568
Change-Id: I85de99093656327267c1fd25539a4c4b227f7104
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 19:15:53 +00:00
Roshan Pius
996129be91
Merge "felix: Replace NFC app with NFC apex" into main
2023-10-16 18:31:03 +00:00
Lokesh Kumar Goel
325247424b
Update felix SVN to 28 am: 0804c4be4d
am: 07ef905d8b
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24896430
Change-Id: I14d9161fef8cd9eb3d0ff0b51a4c6913dc78c7ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 05:35:25 +00:00
Lokesh Kumar Goel
07ef905d8b
Update felix SVN to 28 am: 0804c4be4d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24896430
Change-Id: I2d9cea545cecde60e8241155014e2dfa6e6bccab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 05:04:25 +00:00
Alice Kuo
49c941fb4a
Merge "Add LE Audio allow list candidate device" into main
2023-10-14 09:00:00 +00:00
Roshan Pius
4e94c7642a
felix: Replace NFC app with NFC apex
...
Bug: 303286040
Test: Compiles
Merged-In: I9ae8d7630d18075b8620997582761787af1a65b4
Change-Id: I9ae8d7630d18075b8620997582761787af1a65b4
2023-10-13 18:05:54 +00:00
Guibing Cai
dd35af65b3
Merge "powerhint: felix: update vendor_sched procfs paths" into main
2023-10-13 17:18:27 +00:00
Roshan Pius
cd1582228c
Merge "felix: Replace NFC app with NFC apex" into main
2023-10-13 14:12:07 +00:00
Leo Chen
982803b81f
Update IDisplay to V10
...
Test: Build pass
Bug: 299410182
Change-Id: I3d368dab1fde2f9cf5d4dea6730f28d45dfacc4f
Signed-off-by: Leo Chen <yinchiuan@google.com>
2023-10-12 07:48:25 +00:00
Cole Faust
58596729eb
Use PRODUCT_COPY_FILES to install uwb country files am: 4e3ea6e815
am: 96d360a576
am: 337debd3fd
am: 4d31ff02c2
am: ab6e33ccea
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2777909
Change-Id: I5880d29890dcc3c061f5bce8ae7f346642160fdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 20:20:18 +00:00
Cole Faust
ab6e33ccea
Use PRODUCT_COPY_FILES to install uwb country files am: 4e3ea6e815
am: 96d360a576
am: 337debd3fd
am: 4d31ff02c2
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2777909
Change-Id: I220f48a43df9002d783951055ecc0e07427c7afa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 19:47:19 +00:00
Cole Faust
4d31ff02c2
Use PRODUCT_COPY_FILES to install uwb country files am: 4e3ea6e815
am: 96d360a576
am: 337debd3fd
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2777909
Change-Id: I6dcdc3421c8d445697781858e0184333adcac851
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 19:13:07 +00:00
Cole Faust
337debd3fd
Use PRODUCT_COPY_FILES to install uwb country files am: 4e3ea6e815
am: 96d360a576
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2777909
Change-Id: I315544b444a54358c14d51f5310b1e7405a86cb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 18:17:37 +00:00
Cole Faust
96d360a576
Use PRODUCT_COPY_FILES to install uwb country files am: 4e3ea6e815
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2777909
Change-Id: I614b9bbbaf2fad2a28a6f4f5182fc70b7f0421d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 17:45:51 +00:00