Commit graph

3545 commits

Author SHA1 Message Date
Edwin Tung
afe8547c8f Revert "gps: enable GNSS PPS feature"
This reverts commit 9b97563405.

Reason for revert: b/230265527 shows PPS malfunction impact gps location report. We need to disable PPS until PPS function fully functionality and robust.
Bug: 230265527

Change-Id: Iedd753fd243ec268268418629c2c7fa94ce57b9f
2022-05-11 08:49:24 +00:00
Automerger Merge Worker
70ffdf2165 Merge "Remove config_tcp_buffers am: d1d22866c5 am: e724c8fb48" into tm-d1-dev-plus-aosp am: 8d2a6ab6a5
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18282698

Change-Id: I2365427e1a532a5aaa0f577cbc77b9fa8d7420e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 03:42:10 +00:00
Sarah Chin
fc1fee52c4 Remove config_tcp_buffers am: d1d22866c5 am: 553f30bab3 am: e1687c5b52
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18282698

Change-Id: Iec25417e35b8edbc6e012e2a846a430c9c519e89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 03:39:48 +00:00
Sarah Chin
3616f508cd Remove config_tcp_buffers am: d1d22866c5 am: 553f30bab3 am: 3a7d232c7b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18282698

Change-Id: Ic5552283e73e4232c051f89d546bd50e2fa6dbaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 03:38:23 +00:00
Automerger Merge Worker
8d2a6ab6a5 Merge "Remove config_tcp_buffers am: d1d22866c5 am: e724c8fb48" into tm-d1-dev-plus-aosp 2022-05-11 02:45:40 +00:00
Sarah Chin
3a7d232c7b Remove config_tcp_buffers am: d1d22866c5 am: 553f30bab3
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18282698

Change-Id: Ic3abf55517156197bd4912d722626dc2b1284bd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:45:09 +00:00
Sarah Chin
38a7ca5ad9 Remove config_tcp_buffers am: d1d22866c5 am: e724c8fb48
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18282698

Change-Id: I1b8714a5d51a7a6252a2377fa1f181e28845694a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:45:08 +00:00
Sarah Chin
e1687c5b52 Remove config_tcp_buffers am: d1d22866c5 am: 553f30bab3
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18282698

Change-Id: Id2064ec916903f2ad78479da6a821a77bf8b305f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:45:03 +00:00
Sarah Chin
553f30bab3 Remove config_tcp_buffers am: d1d22866c5
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18282698

Change-Id: I8ea42094e79295b0caa94da0ad561725cb092d28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:19:38 +00:00
Sarah Chin
e724c8fb48 Remove config_tcp_buffers am: d1d22866c5
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18282698

Change-Id: Id0ded5f23df8951f874e0476e5a25f2302905f06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:16:01 +00:00
Sarah Chin
d1d22866c5 Remove config_tcp_buffers
Moved to default values

Test: build
Bug: 222323543
Change-Id: If7ebd63c586974756d3e374b8c0cbfb27a5f1819
2022-05-11 01:44:18 +00:00
Alice Kuo
c014e57ffd Disable LE audio related profiles for gs101
Bug: 231671426
Test: build
Change-Id: I39c98cfd51047113f203d05c6f6853e635b02c45
2022-05-11 08:48:54 +08:00
Chris.CC Lee
cf5b3564e5 [Gs101] Add NEARBY_WIFI_DEVICES for Restore am: 908fbc0a20 am: 3d05d3f20d am: 14d7f1b713
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18047570

Change-Id: I68fa8ff7f7b940d60d1625c6bdc4ecf1d2d67d43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:32:07 +00:00
Chris.CC Lee
b243dc165f [Gs101] Add NEARBY_WIFI_DEVICES for Restore am: 908fbc0a20 am: 3d05d3f20d am: d086385a14
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18047570

Change-Id: I7fb3b4f35ad3e8bf213d49fa776b43f0e5e48eb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:23:06 +00:00
Chris.CC Lee
e610fc7fbb [Gs101] Add NEARBY_WIFI_DEVICES for Restore am: 908fbc0a20 am: ecf1731bc8 am: 21804a3310
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18047570

Change-Id: I8705009e4eb1be37048d76802cbbed1d8e4c5709
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:52:06 +00:00
Chris.CC Lee
14d7f1b713 [Gs101] Add NEARBY_WIFI_DEVICES for Restore am: 908fbc0a20 am: 3d05d3f20d
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18047570

Change-Id: I66f634911b0f502d507e7e8b1720cbf4868e4c9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:47:31 +00:00
Chris.CC Lee
d086385a14 [Gs101] Add NEARBY_WIFI_DEVICES for Restore am: 908fbc0a20 am: 3d05d3f20d
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18047570

Change-Id: I82098a598b5996c60909b10b2e228aeab59eb783
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:42:03 +00:00
Chris.CC Lee
21804a3310 [Gs101] Add NEARBY_WIFI_DEVICES for Restore am: 908fbc0a20 am: ecf1731bc8
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18047570

Change-Id: Ia41147505ce449043a51e9d297970536758e35ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:17:50 +00:00
Chris.CC Lee
3d05d3f20d [Gs101] Add NEARBY_WIFI_DEVICES for Restore am: 908fbc0a20
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18047570

Change-Id: Ibab91cb8a73d16e064380b42786f918850c848ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 20:42:51 +00:00
Chris.CC Lee
ecf1731bc8 [Gs101] Add NEARBY_WIFI_DEVICES for Restore am: 908fbc0a20
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18047570

Change-Id: I3b20ff314ddd2eb2afa758502839548280b6fb08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 20:40:44 +00:00
Chris.CC Lee
908fbc0a20 [Gs101] Add NEARBY_WIFI_DEVICES for Restore
We used ACCESS_FINE_LOCATION to start a WiFi P2P connection. From
Android T, the required permission is changed to NEARBY_WIFI_DERVICES
instead.

Bug: 219855567
Test: Manual tested on Oriole. Used a local built Restore APK which
declares the use of the permission. Push that APK to the test Oriole and
validate the permission is granted by default.

Change-Id: I56924aa3e0250c94bc4fefe5d9b901b4e23d0c2b
2022-05-10 15:39:31 +00:00
Taehwan Kim
8babdc724f modify device.mk for exposing supported pool type am: 3d0ce54976 am: 3712e39200 am: c42917ddde
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18180375

Change-Id: Id75f2c450298d5cef5bcd0bf228bf84d0b6c5cd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 18:18:07 +00:00
Taehwan Kim
943cfbf5d0 modify device.mk for exposing supported pool type am: 3d0ce54976 am: 3712e39200 am: 627956029c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18180375

Change-Id: I7a3e37ec24413e82596775f3ba1af2d3a6a591c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 18:05:37 +00:00
Taehwan Kim
2b343e0605 modify device.mk for exposing supported pool type am: 3d0ce54976 am: ba1345e087 am: edee74f017
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18180375

Change-Id: Ia62e19e2373c300913bc6ea04780176fb5c3840f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 17:46:25 +00:00
Taehwan Kim
c42917ddde modify device.mk for exposing supported pool type am: 3d0ce54976 am: 3712e39200
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18180375

Change-Id: Ic09b623f409638bbd0e53e21e5ba87261a583aec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 17:37:38 +00:00
Taehwan Kim
edee74f017 modify device.mk for exposing supported pool type am: 3d0ce54976 am: ba1345e087
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18180375

Change-Id: I221fa0e61aaddbaa4af4c0c45cc4f3db18285e7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 16:23:31 +00:00
Taehwan Kim
ba1345e087 modify device.mk for exposing supported pool type am: 3d0ce54976
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18180375

Change-Id: I191084b83cb2d79223e937143b4e96654497ef82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 15:19:09 +00:00
Taehwan Kim
627956029c modify device.mk for exposing supported pool type am: 3d0ce54976 am: 3712e39200
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18180375

Change-Id: Icf62628abea3f8567e67b0bd3c6589097f473082
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 15:12:01 +00:00
Taehwan Kim
3712e39200 modify device.mk for exposing supported pool type am: 3d0ce54976
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18180375

Change-Id: I100e6447093d18004d01e4d75781bc7d07d761c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 14:17:14 +00:00
Taehwan Kim
3d0ce54976 modify device.mk for exposing supported pool type
default : ION(1 << 16) | BUFFERQUEUE(1 << 18)
add : GRALLOC(1 << 17)

Bug: 227283773
Test: CtsMediaV2TestCases
Signed-off-by: Taehwan Kim <t_h.kim@samsung.com>
Change-Id: I299e6ff0ad03de632ee3de77a6aeb89f1609272f
2022-05-09 08:15:45 +00:00
Edwin Tung
c2a0283159 [automerger skipped] [DO NOT MERGE][R4O6] gps: update gps driver 129.20.23.535937 am: 346895302a -s ours am: 4946763008 -s ours am: 8c6e0950f4 -s ours am: 8a5affa409 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18140922

Change-Id: Ia181950110e2518be788f10c4c1e888efafa48d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 04:42:27 +00:00
Edwin Tung
44cc4e23e8 [automerger skipped] [DO NOT MERGE][R4O6] gps: update gps driver 129.20.23.535937 am: 346895302a -s ours am: 4946763008 -s ours am: f1a9ea7cff -s ours am: 0e764fe6ba -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18140922

Change-Id: Ib53cde252c597e801c661386104771f487bf0f57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 04:42:21 +00:00
Edwin Tung
3af90144d4 [automerger skipped] [DO NOT MERGE][R4O6] gps: update gps driver 129.20.23.535937 am: 346895302a -s ours am: 4946763008 -s ours am: 8c6e0950f4 -s ours am: a1ee67000b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18140922

Change-Id: Iff9b5036e398ae06511299334daff1e72974d5d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 04:42:02 +00:00
Edwin Tung
8a5affa409 [automerger skipped] [DO NOT MERGE][R4O6] gps: update gps driver 129.20.23.535937 am: 346895302a -s ours am: 4946763008 -s ours am: 8c6e0950f4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18140922

Change-Id: Ic09cf2b5904431c9f280dbf2061900cd79768981
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 04:20:41 +00:00
Edwin Tung
0e764fe6ba [automerger skipped] [DO NOT MERGE][R4O6] gps: update gps driver 129.20.23.535937 am: 346895302a -s ours am: 4946763008 -s ours am: f1a9ea7cff -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18140922

Change-Id: I23b364989a74be2a0d738a52b20471ad4548cab2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 04:20:34 +00:00
Edwin Tung
a1ee67000b [automerger skipped] [DO NOT MERGE][R4O6] gps: update gps driver 129.20.23.535937 am: 346895302a -s ours am: 4946763008 -s ours am: 8c6e0950f4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18140922

Change-Id: I3629e3351b345dc13c59ed686abc3583c9899c4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 04:20:33 +00:00
Edwin Tung
8c6e0950f4 [automerger skipped] [DO NOT MERGE][R4O6] gps: update gps driver 129.20.23.535937 am: 346895302a -s ours am: 4946763008 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18140922

Change-Id: If71020447a9690629149d961b2b6459ebb34e71e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 03:57:49 +00:00
Edwin Tung
f1a9ea7cff [automerger skipped] [DO NOT MERGE][R4O6] gps: update gps driver 129.20.23.535937 am: 346895302a -s ours am: 4946763008 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18140922

Change-Id: I064dd12aae8b547cf105a9bd596bf28a6dbdf454
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 03:56:25 +00:00
Edwin Tung
4946763008 [automerger skipped] [DO NOT MERGE][R4O6] gps: update gps driver 129.20.23.535937 am: 346895302a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18140922

Change-Id: I30bb39542c2245120cbb8dfa7134e28f543f8032
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 03:40:08 +00:00
Automerger Merge Worker
31770549dd Merge "[automerger skipped] usb: remove set_usb_irq script for irq change am: b1f75858c8 am: 1eaedf517e -s ours" into tm-d1-dev-plus-aosp am: 0c4d3a3d5d -s ours
am skip reason: Merged-In Iea0aed110183d9583db00d9b182d351de41573cd with SHA-1 b1f75858c8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18154296

Change-Id: I8cb3ecbe54d6d28667d197fe4cda2442c369b50e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 09:18:10 +00:00
Automerger Merge Worker
c02a1a9dc3 Merge "[automerger skipped] tune usb irq (dwc3) in usb gadget hal am: ba3dc9b3da am: 1de6118168 -s ours" into tm-d1-dev-plus-aosp am: 5f31a615e8 -s ours
am skip reason: Merged-In Id993db9fc303e85a9a6337a0e41b1dfd6fc9a86a with SHA-1 ba3dc9b3da is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17313948

Change-Id: If808d11e30f131466b042e89773743f37efbc1f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 09:18:07 +00:00
Automerger Merge Worker
2e8d62155c Merge "[automerger skipped] usb: move the permission change to usb rc am: 7da5d4f43f am: 4e562f8b88 -s ours" into tm-d1-dev-plus-aosp am: d5d6dfaddf -s ours
am skip reason: Merged-In I45c1318f647220480fa03ba3b813a81b21393d71 with SHA-1 7da5d4f43f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17313947

Change-Id: I60cc0334368eb7769bbeb8edcf51e5fe6c86c3e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 09:18:05 +00:00
Automerger Merge Worker
fcae9fcc38 Merge "[automerger skipped] usb: remove set_usb_irq script for irq change am: b1f75858c8 -s ours am: 4eb573cd31 -s ours am: eb113e58d6 -s ours" into tm-qpr-dev-plus-aosp 2022-05-05 09:17:46 +00:00
Automerger Merge Worker
a9d230d08e Merge "[automerger skipped] tune usb irq (dwc3) in usb gadget hal am: ba3dc9b3da -s ours am: 0381fbffee -s ours am: ab60faf478 -s ours" into tm-qpr-dev-plus-aosp 2022-05-05 09:17:46 +00:00
Automerger Merge Worker
dc4bb8db0a Merge "[automerger skipped] usb: move the permission change to usb rc am: 7da5d4f43f -s ours am: f02284d94f -s ours am: b74a2fb388 -s ours" into tm-qpr-dev-plus-aosp 2022-05-05 09:17:46 +00:00
Ray Chi
7a5ff147de [automerger skipped] usb: remove set_usb_irq script for irq change am: b1f75858c8 -s ours am: 4eb573cd31 -s ours am: eb113e58d6 -s ours
am skip reason: Merged-In Iea0aed110183d9583db00d9b182d351de41573cd with SHA-1 a5f995d2f6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18154296

Change-Id: Id55792ad809e6e6f7a3362a63960d59d1b873c06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 09:17:39 +00:00
Ray Chi
fbb9a30e8f [automerger skipped] tune usb irq (dwc3) in usb gadget hal am: ba3dc9b3da -s ours am: 0381fbffee -s ours am: ab60faf478 -s ours
am skip reason: Merged-In Id993db9fc303e85a9a6337a0e41b1dfd6fc9a86a with SHA-1 49a9b9f3dd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17313948

Change-Id: If34027c26264d8d328cae629839b1dcefde75722
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 09:17:36 +00:00
Ray Chi
7b562117e0 [automerger skipped] usb: move the permission change to usb rc am: 7da5d4f43f -s ours am: f02284d94f -s ours am: b74a2fb388 -s ours
am skip reason: Merged-In I45c1318f647220480fa03ba3b813a81b21393d71 with SHA-1 bc34b8944f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17313947

Change-Id: Ib0581ea2a79f331fa1ab9116092afa61ec259f94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 09:17:34 +00:00
Ray Chi
e52cc15f1b [automerger skipped] usb: remove set_usb_irq script for irq change am: b1f75858c8 am: 1eaedf517e am: b64f946068 -s ours
am skip reason: Merged-In Iea0aed110183d9583db00d9b182d351de41573cd with SHA-1 a5f995d2f6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18154296

Change-Id: I56c374488bea5602510992d1ee7fa958350c8a26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 09:17:32 +00:00
Ray Chi
a3ad0d35b1 [automerger skipped] tune usb irq (dwc3) in usb gadget hal am: ba3dc9b3da am: 1de6118168 am: 965680b915 -s ours
am skip reason: Merged-In Id993db9fc303e85a9a6337a0e41b1dfd6fc9a86a with SHA-1 49a9b9f3dd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17313948

Change-Id: I34bb4e729da15a37d73c93457000264ae944af50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 09:17:28 +00:00