Commit graph

3440 commits

Author SHA1 Message Date
Sal Savage
3cb7308fd5 Use the ?= operator so BT properties can be overridden
System properties set with the "=" operator cannot be overriden. This
device is used elsewhere in the system and some of the properties need
to be overridden. The "?=" operator will use the assigned value if no
other values are assigned elsewhere, allowing for overrides.

Bug: 230638462
Test: adb shell getprop | grep bluetooth
Change-Id: I45b1786f5556ba3e7d493ea17dc955cd317a1156
2022-04-28 19:45:14 +00:00
Minchan Kim
b584dfcbac dumpstate: change page_pinner output file name
Change konb name to "buffer"

Bug: 230651222
Test: check dumpstate_board.txt from adb bugreport
Signed-off-by: Minchan Kim <minchan@google.com>
Change-Id: I4fbab07047af73e38bad3c4a222ba191d045a961
2022-04-28 17:47:19 +00:00
Jerry Huang
0b26c93630 media: gs101: update performance data for Android T am: a383848cc1 am: 08561ad4dc am: 8603603fd5
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17898287

Change-Id: Ib6aeded752302f9a391dfbc44fb2e25e6c7a717b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 10:17:57 +00:00
Jerry Huang
b1e612587e media: gs101: update performance data for Android T am: a383848cc1 am: 08561ad4dc am: 4023c73cbf
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17898287

Change-Id: Ic9b3589280d337c2b7667835f6f6ee5f874aa08e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 10:09:44 +00:00
Jerry Huang
05f51a56fc media: gs101: update performance data for Android T am: a383848cc1 am: ecca212ed7 am: c7a80b41d9
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17898287

Change-Id: I7ed6a7bda76b467d8be819582e0bbd65e66df55f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 10:09:18 +00:00
Jerry Huang
4023c73cbf media: gs101: update performance data for Android T am: a383848cc1 am: 08561ad4dc
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17898287

Change-Id: Ib6bc8dc6fb7ba9fb14e0f6a7c007d6d580d4313b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 09:52:38 +00:00
Jerry Huang
8603603fd5 media: gs101: update performance data for Android T am: a383848cc1 am: 08561ad4dc
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17898287

Change-Id: Ie68622d5573614d3e83d308e6d2893ae24622089
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 09:52:37 +00:00
Jerry Huang
c7a80b41d9 media: gs101: update performance data for Android T am: a383848cc1 am: ecca212ed7
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17898287

Change-Id: I1aec37e20572e8d12cb4ea7ed614ff170b9a07f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 09:42:53 +00:00
Jerry Huang
dded3c8ed8 media: gs101: update performance data for Android T am: a383848cc1 am: e63000b3ea
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17898287

Change-Id: Ib930d74ee0213296ecbdea89753c0ba5478eb79b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 09:41:48 +00:00
Jerry Huang
08561ad4dc media: gs101: update performance data for Android T am: a383848cc1
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17898287

Change-Id: I45de7d81fee2d7f252d4d56acd69a339599188e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 09:25:20 +00:00
Jerry Huang
e63000b3ea media: gs101: update performance data for Android T am: a383848cc1
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17898287

Change-Id: Ie5a35dcb8d4f4fb4d71e4f5f53d74c04278cc187
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 09:24:06 +00:00
Edwin Tung
a730599ebb gps: update gps driver 142.20.23.534799 am: eff3df6d75 am: c3b3b5db2b am: 510132f2b1
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17925911

Change-Id: I9bf60e5c0b0e815eab3016ad0aa12c5f8707fcfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 09:24:01 +00:00
Edwin Tung
2ca557c10e gps: update gps driver 142.20.23.534799 am: eff3df6d75 am: daea6c950b am: f2192e50e3
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17925911

Change-Id: Ia7edbc5af6ff0b232308c144d75c4ab84709644a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 09:23:41 +00:00
Jerry Huang
ecca212ed7 media: gs101: update performance data for Android T am: a383848cc1
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17898287

Change-Id: I7be1dbfaae2a8588f594cf2f6f49e68baee73589
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 09:23:34 +00:00
Edwin Tung
40bddb9371 gps: update gps driver 142.20.23.534799 am: eff3df6d75 am: c3b3b5db2b am: 51d8e0404a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17925911

Change-Id: I6b1dc33a71dfef10950c6b904d5487a8ace3538c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 09:23:24 +00:00
Edwin Tung
510132f2b1 gps: update gps driver 142.20.23.534799 am: eff3df6d75 am: c3b3b5db2b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17925911

Change-Id: I7d510725404d6c3275cdcb513cc5a048e1d97ccd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 08:42:02 +00:00
Edwin Tung
51d8e0404a gps: update gps driver 142.20.23.534799 am: eff3df6d75 am: c3b3b5db2b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17925911

Change-Id: Ice465746eb09f9178eedd5a77abc3df8098e22c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 08:40:43 +00:00
Edwin Tung
f2192e50e3 gps: update gps driver 142.20.23.534799 am: eff3df6d75 am: daea6c950b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17925911

Change-Id: I2d39acbf6a395c61491843dd2c9b2a62ceb49cb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 08:40:27 +00:00
Edwin Tung
14d134f0d7 gps: update gps driver 142.20.23.534799 am: eff3df6d75 am: 673337105a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17925911

Change-Id: Iaabc6b117d81e9606c1e8facc80ef4d6103fcbbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 08:39:55 +00:00
Jerry Huang
a383848cc1 media: gs101: update performance data for Android T
Bug: 226805912
Test:
android.media.decoder.cts.VideoDecoderPerfTest
android.video.cts.VideoEncoderDecoderTest

Change-Id: If01b4774445a47ddabef64e3800db281b106e219
2022-04-28 08:39:50 +00:00
Edwin Tung
673337105a gps: update gps driver 142.20.23.534799 am: eff3df6d75
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17925911

Change-Id: Ic04c1ad322daa1588d77a5e2c80ec72a2684ff82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 07:54:06 +00:00
Edwin Tung
daea6c950b gps: update gps driver 142.20.23.534799 am: eff3df6d75
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17925911

Change-Id: Iae1a3c943b91afcb9d3c24ee78d877c96d25914d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 07:53:01 +00:00
Edwin Tung
c3b3b5db2b gps: update gps driver 142.20.23.534799 am: eff3df6d75
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17925911

Change-Id: Ifc06026edc352f7b69d708d12670d31cde2f57de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 07:52:30 +00:00
Edwin Tung
eff3df6d75 gps: update gps driver 142.20.23.534799
Migrate GNSS HIDL HAL to AIDL HAL
Add a gps.xml configuration parameter for CHRE/CHPP baud rate
Fix for PVT assertion at patch_pvt_engine_cbs line=0078
Additional field in SatellitePVT
Prevent the wrong common bias delta estimation
Prevent wrong unhealthy satellites selection
Fix LPPe UBP rounding error
Fix LPPe UBP error message
Fix ADR issues
Add debug log for ADR and clk Bias
Support pressureNotAvailable in LPPe
Fix AIDL2 measurement corrections issue
Fix unregistered pressure data after LPPe session
Fix dereferenced null pointer
Handle LTE B13/14 band handover
Fixed the ordering of the GLNS satellites based on the ephemeris availability
Report AGC values by constellation and central frequency

Bug: 226691677
Bug: 218580284
Bug: 213009701
Bug: 226805895
Bug: 223361838
Bug: 226112617
Bug: 223593119
Bug: 225285619
Bug: 224969521
Bug: 225278936
Bug: 225285619
Bug: 228301290
Bug: 228405504
Bug: 229038024
Bug: 228288159
Bug: 229032461
Bug: 228791446

Verify test: 230286350

Test: atest VtsHalGnssTargetTest
atest CtsLocationGnssTestCases
atest GtsLocationTestCases
atest PtsChreTestRunner

Change-Id: Ia074bc30bf2ff52ea7ba26324c52c06c00b70979
2022-04-28 07:08:47 +00:00
Sal Savage
08e8353b96 [automerger skipped] Update LE Audio profile properties to match spec and implementation am: 4e33220086 am: 79671e4a0f -s ours am: 59119754b9 -s ours am: e58e3d0632 -s ours
am skip reason: Merged-In I5699914c673f4bdaeabef128ff94122bf1963f97 with SHA-1 2e7610e4d3 is already in history

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

Change-Id: Id7982d85d78faa5c51d3bf0b11d28016274e47c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 23:24:56 +00:00
Sal Savage
e58e3d0632 [automerger skipped] Update LE Audio profile properties to match spec and implementation am: 4e33220086 am: 79671e4a0f -s ours am: 59119754b9 -s ours
am skip reason: Merged-In I5699914c673f4bdaeabef128ff94122bf1963f97 with SHA-1 2e7610e4d3 is already in history

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

Change-Id: I736ef1211ba3f24329d22e8263b2db63284dd024
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 23:02:50 +00:00
Sal Savage
59119754b9 [automerger skipped] Update LE Audio profile properties to match spec and implementation am: 4e33220086 am: 79671e4a0f -s ours
am skip reason: Merged-In I5699914c673f4bdaeabef128ff94122bf1963f97 with SHA-1 2e7610e4d3 is already in history

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

Change-Id: I0fd315338c1df4c339f5309d8a8092501ed7e4dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 22:55:14 +00:00
Sal Savage
79671e4a0f Update LE Audio profile properties to match spec and implementation am: 4e33220086
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2072118

Change-Id: I603b3899dfa54e8291ab87f7d4978288328ca6c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 21:48:34 +00:00
Automerger Merge Worker
47a3153ffc Merge "Switch BluetoothCcc hal to 1.1 am: 83601df27a am: 3e780709f2" into tm-d1-dev-plus-aosp am: 90e795e30a am: c4602650a2
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17887240

Change-Id: Iedb83f454f433fb75b2f33c31926e48b376309d5
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 13:20:29 +00:00
Automerger Merge Worker
38fb697307 Merge "Switch BluetoothCcc hal to 1.1 am: 83601df27a am: 85a0bf43c4 am: 3feb977796" into tm-qpr-dev-plus-aosp am: 2150794f94
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17887240

Change-Id: Id2e6d7b198238fb45a9abe4053bc367c2d7f23a5
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 13:19:40 +00:00
Ted Wang
2665b0e21d Switch BluetoothCcc hal to 1.1 am: 83601df27a am: 85a0bf43c4 am: 4a8c62a723 am: ee4002c771
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17887240

Change-Id: I51ae4754bd7d834f84fcdc0d74c70dd5534c50dd
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 13:18:14 +00:00
Automerger Merge Worker
c4602650a2 Merge "Switch BluetoothCcc hal to 1.1 am: 83601df27a am: 3e780709f2" into tm-d1-dev-plus-aosp am: 90e795e30a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17887240

Change-Id: I9a535499ac12266acd401803aff9c1780a784945
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 12:42:22 +00:00
Automerger Merge Worker
2150794f94 Merge "Switch BluetoothCcc hal to 1.1 am: 83601df27a am: 85a0bf43c4 am: 3feb977796" into tm-qpr-dev-plus-aosp 2022-04-26 12:41:51 +00:00
Ted Wang
4294bef77a Switch BluetoothCcc hal to 1.1 am: 83601df27a am: 85a0bf43c4 am: 3feb977796
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17887240

Change-Id: I8c1a570dc641c62d388e2fb847c6b7f58a2619ae
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 12:41:36 +00:00
Ted Wang
ee4002c771 Switch BluetoothCcc hal to 1.1 am: 83601df27a am: 85a0bf43c4 am: 4a8c62a723
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17887240

Change-Id: I6d2d6fe120367bf3d980e3bae498ae8381a79c12
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 12:41:21 +00:00
Automerger Merge Worker
90e795e30a Merge "Switch BluetoothCcc hal to 1.1 am: 83601df27a am: 3e780709f2" into tm-d1-dev-plus-aosp 2022-04-26 11:58:31 +00:00
Ted Wang
4a8c62a723 Switch BluetoothCcc hal to 1.1 am: 83601df27a am: 85a0bf43c4
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17887240

Change-Id: I399009dc85b5a806b77df6f5e0f7d168bb13cd87
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 11:58:23 +00:00
Ted Wang
1cfbb4d3be Switch BluetoothCcc hal to 1.1 am: 83601df27a am: 3e780709f2
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17887240

Change-Id: I904c3674dd8b903f9b0b847ca8df3d5a0930ede7
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 11:58:17 +00:00
Ted Wang
3feb977796 Switch BluetoothCcc hal to 1.1 am: 83601df27a am: 85a0bf43c4
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17887240

Change-Id: I7a1ec18dc4079bdfc40c321b60f72ffd5d0f945b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 11:58:09 +00:00
Ted Wang
d5fe593647 Switch BluetoothCcc hal to 1.1 am: 83601df27a am: 291bc33bc8
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17887240

Change-Id: Id1986dd97936adf1b196571f4c0046772a546f75
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 11:57:49 +00:00
Ted Wang
85a0bf43c4 Switch BluetoothCcc hal to 1.1 am: 83601df27a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17887240

Change-Id: I254b969c40e076beb31a39234ba3f96932f38844
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 11:35:00 +00:00
Ted Wang
291bc33bc8 Switch BluetoothCcc hal to 1.1 am: 83601df27a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17887240

Change-Id: I18bda42a904f0d232cf7524c1f7dd0384d0e1b82
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 11:34:06 +00:00
Ted Wang
3e780709f2 Switch BluetoothCcc hal to 1.1 am: 83601df27a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17887240

Change-Id: I7e1b61285a15fa3b2c0b9fb15807a72379e9aa55
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 11:33:44 +00:00
Ted Wang
83601df27a Switch BluetoothCcc hal to 1.1
Bug: 229710243
Test: make
Change-Id: I991da922b0c290992c63632efffbabff46c537cb
2022-04-26 10:07:23 +00:00
Automerger Merge Worker
c3b56dc33c Merge "powerhal: update new boost uclamp value am: 267e8bb958 am: d34d3765c6" into tm-d1-dev-plus-aosp am: 1fb7131259 am: 666762ab22
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17943624

Change-Id: If5c418652101b9e17982042d41e8c6b7eb819038
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 07:50:49 +00:00
chungkai
b97b7ff068 powerhal: update new boost uclamp value am: 267e8bb958 am: d856bf69f2 am: fdce95fa0c am: 28257efc60
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17943624

Change-Id: Ie1707fdfb79f0872702a7a0f47a78b9ea05b3c1d
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 07:49:56 +00:00
chungkai
386458abf2 powerhal: update new boost uclamp value am: 267e8bb958 am: d856bf69f2 am: 0ddc5b9510 am: c97ae13df4
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17943624

Change-Id: I9b691780446346db15a3d824a0d082f7cea25325
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 07:49:00 +00:00
Automerger Merge Worker
666762ab22 Merge "powerhal: update new boost uclamp value am: 267e8bb958 am: d34d3765c6" into tm-d1-dev-plus-aosp am: 1fb7131259
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17943624

Change-Id: Idc6bcbcd96875b493e37d2673eb9d495b3a29e1e
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 07:26:39 +00:00
chungkai
28257efc60 powerhal: update new boost uclamp value am: 267e8bb958 am: d856bf69f2 am: fdce95fa0c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17943624

Change-Id: I586ba76f51404a327888770469c18c438c4e97e7
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 07:26:00 +00:00
chungkai
c97ae13df4 powerhal: update new boost uclamp value am: 267e8bb958 am: d856bf69f2 am: 0ddc5b9510
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17943624

Change-Id: I82ef0acdeeb004f6af5a3e448c05e266f9fec308
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 07:25:44 +00:00