Ankur Bakshi
d08e4a25fc
Update panther SVN to 39 am: 0fd147e544
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25341847
Change-Id: I71df92e324c2e5eebdbdcca69e25d5ff44fb7c3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 04:29:10 +00:00
Ankur Bakshi
341abbe2bd
Update cheetah SVN to 39 am: ea419cb1ae
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25343873
Change-Id: I08e425aa24bc70a22653695612c8885b3c3e33f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 04:29:00 +00:00
Ankur Bakshi
0fd147e544
Update panther SVN to 39
...
Bug: 309529736
Change-Id: Ifb27544932f89b0e2fd3acfb63316af9a7dd2109
2023-11-16 03:41:42 +00:00
Ankur Bakshi
ea419cb1ae
Update cheetah SVN to 39
...
Bug: 309529736
Change-Id: I6aa90a8ebddb1eab4c26a361569643ce5ed665fe
2023-11-16 03:41:42 +00:00
Ankur Bakshi
4c408c5e21
Update panther SVN to 38 am: 2b4350d830
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25291798
Change-Id: I994bb7c6dd6e188303029c12cb611371e3d5d88a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-11 01:39:09 +00:00
Ankur Bakshi
e3b7a96fe2
Update cheetah SVN to 38 am: deb295c2de
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25293133
Change-Id: If9aad1560c7d2003e00f5f515211c771c068784e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-11 01:39:02 +00:00
Ankur Bakshi
2b4350d830
Update panther SVN to 38
...
Bug: 302612466
Change-Id: I34ce3669c65639ee5059b181a098ef951b51ca74
2023-11-11 00:56:31 +00:00
Ankur Bakshi
deb295c2de
Update cheetah SVN to 38
...
Bug: 302612466
Change-Id: I7a139e86b6773d68e483dc5cb8182355d691fb61
2023-11-10 23:17:59 +00:00
Roshan Pius
f78b5c3137
[automerger skipped] Merge "Revert "pantah(nfc): Modify NFC overlays for NFC apex"" into main am: 6efff16bfc
am: e699a8c761
-s ours
...
am skip reason: Merged-In Idced173f9063bed7899354d20553b3694579329a with SHA-1 6d7b0b8cec
is already in history
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2818127
Change-Id: I762d0e4b8dbad34068becad59beb9ba576183fec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 22:48:58 +00:00
Roshan Pius
0879831a4f
Revert "pantah: Replace NFC app with NFC apex" am: 703decc970
am: 05035f8f52
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2818917
Change-Id: I7676ba733c665305972fb1292d0bc031d97a76cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 22:48:41 +00:00
Roshan Pius
a70f5a11f5
Merge "Revert "pantah(nfc): Modify NFC overlays for NFC apex"" into main am: 6efff16bfc
am: b21db32598
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2818127
Change-Id: I8dc4e06695dafb980ac4c1adf2f5535abf51f2bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 22:46:25 +00:00
Roshan Pius
1989eb2ad4
Revert "pantah: Replace NFC app with NFC apex" am: 703decc970
am: 8797f7365c
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2818917
Change-Id: I683fdd3e876a9e948b0f2e5bb9c863ae2b6668da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 22:46:06 +00:00
Roshan Pius
e699a8c761
Merge "Revert "pantah(nfc): Modify NFC overlays for NFC apex"" into main am: 6efff16bfc
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2818127
Change-Id: Ie543b18d69c75dff32ebf75109c54440ebe07583
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:49:09 +00:00
Roshan Pius
05035f8f52
Revert "pantah: Replace NFC app with NFC apex" am: 703decc970
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2818917
Change-Id: I4a5df2fe11f137be75e94dea6fc217415cfd1a2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:48:53 +00:00
Roshan Pius
b21db32598
Merge "Revert "pantah(nfc): Modify NFC overlays for NFC apex"" into main am: 6efff16bfc
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2818127
Change-Id: I25723a7f52e9b5e5a6764832ca5e11cffc316f92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:45:45 +00:00
Roshan Pius
8797f7365c
Revert "pantah: Replace NFC app with NFC apex" am: 703decc970
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2818917
Change-Id: Id6c763a588f2db2bfeadd80ceca5cff2c507ff00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:45:26 +00:00
Roshan Pius
6efff16bfc
Merge "Revert "pantah(nfc): Modify NFC overlays for NFC apex"" into main
2023-11-08 21:16:20 +00:00
Roshan Pius
703decc970
Revert "pantah: Replace NFC app with NFC apex"
...
Revert submission 24993894-cherrypicker-L80100000963393177:N49200001411943056
Reason for revert: Causing bootloop with signed builds
Reverted changes: /q/submissionid:24993894-cherrypicker-L80100000963393177:N49200001411943056
Bug: 309117462
Test: Compiles, device boots up
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3000cdee0ef5284ba9fdc68bcdebedbcceb65b10 )
Merged-In: I9adf4d5adf38a986fb95ca43e307914ae7439394
Change-Id: I9adf4d5adf38a986fb95ca43e307914ae7439394
2023-11-08 00:18:16 +00:00
Roshan Pius
6d7b0b8cec
Revert "pantah(nfc): Modify NFC overlays for NFC apex"
...
Revert submission 2802548-nfc_apex
Reason for revert: Causing bootloop with signed builds
Reverted changes: /q/submissionid:2802548-nfc_apex
Bug: 309117462
Test: Compiles, device boots up
Merged-In: Idced173f9063bed7899354d20553b3694579329a
Change-Id: Idced173f9063bed7899354d20553b3694579329a
2023-11-06 19:45:50 +00:00
Greg Kaiser
345b2803e0
[automerger skipped] Fix lunch choices for git_main am: 5e34e006c3
am: b4426c3690
-s ours
...
am skip reason: Merged-In I1390f8707ed0eca0bf51112eef4b2cc4328e52a8 with SHA-1 5e34e006c3
is already in history
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2811163
Change-Id: Ib96236e208c5d3bd80bce21ee682b233f22e5fa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-31 00:07:02 +00:00
Greg Kaiser
b4426c3690
Fix lunch choices for git_main am: 5e34e006c3
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2811163
Change-Id: Ie63f3466d4ccee30f2a6c08e65bf8afd31f16225
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 23:40:15 +00:00
Greg Kaiser
e2fb70f5d0
Fix lunch choices for git_main am: 5e34e006c3
am: ba708323ef
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2811163
Change-Id: I4702d744ddf6dd59e99e3ef372400bbdf34a54be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 23:38:24 +00:00
Greg Kaiser
ba708323ef
Fix lunch choices for git_main am: 5e34e006c3
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2811163
Change-Id: I30a25383b6e6b14ca1d9c1335adb6566f7b8f37c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 23:11:59 +00:00
Greg Kaiser
5e34e006c3
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:b0fb9be930027aa1664c9410697af4a4ec8ab5c3 )
Merged-In: I1390f8707ed0eca0bf51112eef4b2cc4328e52a8
Change-Id: I1390f8707ed0eca0bf51112eef4b2cc4328e52a8
2023-10-30 22:00:49 +00:00
Ankur Bakshi
eef3c350f0
Update panther SVN to 37 am: a1eee239bb
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25181893
Change-Id: Ia26a32b184016c3a644f660fea76d13e55002e93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 02:19:37 +00:00
Ankur Bakshi
fe9d857f70
Update cheetah SVN to 37 am: 9205873929
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25176739
Change-Id: Iad6fd94e952f6e08ec112c06fc3db9ec4e88fd2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 02:19:21 +00:00
Ankur Bakshi
a1eee239bb
Update panther SVN to 37
...
Bug: 302612466
Change-Id: I075a42359d9cdc1984dfb2057808fb1a9bd8e909
2023-10-27 02:06:01 +00:00
Ankur Bakshi
9205873929
Update cheetah SVN to 37
...
Bug: 302612466
Change-Id: I19ff3f5174554e51af5201ec3b5928cfaddf26f6
2023-10-27 02:02:42 +00:00
Shivakumar Neginal
0f79fb5c55
Adding Fast Pair extended IDs for Pixel 7 am: ec518897c2
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25063889
Change-Id: I42a69808ffc8857f3b3b07cd589bc911f382608a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 23:22:20 +00:00
Shivakumar Neginal
ec518897c2
Adding Fast Pair extended IDs for Pixel 7
...
Adding the Fast Pair extended IDs for Pixel 7 so that
Quick Start shows the right Fast Pair bottom sheet on other devices
during setup.
Bug: 305516133
Test: Manually flashed a cheetha and panther device and validated the FP
bottom sheet is displayed on a nearby other device
Change-Id: I29599f388b0689db5e105d00ccf9f4bbfde9d84a
2023-10-26 22:55:38 +00:00
Lokesh Kumar Goel
3b1d29c929
Update panther SVN to 36 am: 59025a6c83
am: 82580c644d
am: 0ef04a6f95
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25176369
Change-Id: I645b4fcb6692c67aedafb74070c9bb3e2ec5dcb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:55:37 +00:00
Lokesh Kumar Goel
ac656e3334
Update cheetah SVN to 36 am: 92a618d04f
am: fbab23735f
am: 1375935ffd
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25176368
Change-Id: Ia9c5c292626c325b387ca9e5e8c37bf52b18a15d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:55:30 +00:00
Lokesh Kumar Goel
ebff7bb2fb
[automerger skipped] Update cheetah SVN to 35 am: 7e02c7f28a
am: f9b2824191
-s ours am: 80a786f706
-s ours
...
am skip reason: skipped by user lokeshgoel
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25175439
Change-Id: Id9a86f41c9997a4e7d97440c646103d68e0ae202
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:55:05 +00:00
Lokesh Kumar Goel
48e5158686
[automerger skipped] Update panther SVN to 35 am: 2a2884b47c
am: 03f3449968
-s ours am: 353714f18e
-s ours
...
am skip reason: skipped by user lokeshgoel
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25175438
Change-Id: Iab408c2fcb4d8c812de551be8f7cfbbd2ea558eb
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
be9dcfd752
Update panther SVN to 36 am: 59025a6c83
am: 2ef063fea3
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25176369
Change-Id: Iadbb9457efe2fc59119cca85ff6c9d032802a5be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:33:22 +00:00
Lokesh Kumar Goel
8702b3bbea
Update cheetah SVN to 36 am: 92a618d04f
am: 8de7f8b190
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25176368
Change-Id: I558e6902f51dfac85a35e9b11aaad77697ac9bc9
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
0e4f5d2d5c
[automerger skipped] Update cheetah SVN to 35 am: 7e02c7f28a
am: 9ebeab8dbf
-s ours
...
am skip reason: skipped by user lokeshgoel
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25175439
Change-Id: I367b34f6189d323dfdec3250300508399c51a33f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:32:43 +00:00
Lokesh Kumar Goel
c89c6d858e
[automerger skipped] Update panther SVN to 35 am: 2a2884b47c
am: 10b98107de
-s ours
...
am skip reason: skipped by user lokeshgoel
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25175438
Change-Id: I94c94513e4e67fc5f89431d9650e606858d68c9a
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
0ef04a6f95
Update panther SVN to 36 am: 59025a6c83
am: 82580c644d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25176369
Change-Id: I46232df6bd94b2702052179103d44fac53b60111
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:24:45 +00:00
Lokesh Kumar Goel
1375935ffd
Update cheetah SVN to 36 am: 92a618d04f
am: fbab23735f
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25176368
Change-Id: Ie204a353d591fcff5232c13c14c9130ed1114c6c
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
80a786f706
[automerger skipped] Update cheetah SVN to 35 am: 7e02c7f28a
am: f9b2824191
-s ours
...
am skip reason: skipped by user lokeshgoel
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25175439
Change-Id: I62e57c1039e9d992f2a5292fde586bc870d9d877
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:24:09 +00:00
Lokesh Kumar Goel
353714f18e
[automerger skipped] Update panther SVN to 35 am: 2a2884b47c
am: 03f3449968
-s ours
...
am skip reason: skipped by user lokeshgoel
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25175438
Change-Id: Ifb6cd042ad1323872b12c1fcc70becc0812d5fb0
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
82580c644d
Update panther SVN to 36 am: 59025a6c83
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25176369
Change-Id: If13f26512dc539bb174bd13336dad4f641625531
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:06:27 +00:00
Lokesh Kumar Goel
fbab23735f
Update cheetah SVN to 36 am: 92a618d04f
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25176368
Change-Id: I3ae528ea4c13b040535ee59b42b0a115efad3337
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
f9b2824191
Update cheetah SVN to 35 am: 7e02c7f28a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25175439
Change-Id: Idc2ffa8e0bfb22a8803d778afc9ea73a39f026ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:06:03 +00:00
Lokesh Kumar Goel
03f3449968
Update panther SVN to 35 am: 2a2884b47c
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25175438
Change-Id: I95504310275c226fde1aa443c9d9584b6e03d555
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
2ef063fea3
Update panther SVN to 36 am: 59025a6c83
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25176369
Change-Id: Ifa0ea0e95a76e63f0190ca8e4dd8b46ab6b0c03f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:03:59 +00:00
Lokesh Kumar Goel
8de7f8b190
Update cheetah SVN to 36 am: 92a618d04f
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25176368
Change-Id: I1ae9880d5e49d4b28946e7b0af49be40c0ae5781
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:03:53 +00:00
Lokesh Kumar Goel
9ebeab8dbf
Update cheetah SVN to 35 am: 7e02c7f28a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25175439
Change-Id: I3ac45a680e210301458cc6b995dad5a119052baa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:03:33 +00:00
Lokesh Kumar Goel
10b98107de
Update panther SVN to 35 am: 2a2884b47c
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25175438
Change-Id: I7b8f7a4a0b6e30bdb821dbc56cd6cbeb815282bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:03:26 +00:00