Commit graph

5216 commits

Author SHA1 Message Date
Sal Savage
f2a7a37f74 [automerger skipped] Merge "Set default the Bluetooth class of device" am: fff19eff05 am: c0014f19cc -s ours am: ee2c2304ae -s ours am: be1686bac0 -s ours am: 072e3c8e79 -s ours
am skip reason: Merged-In I75a6fb83a6149f58372b7aa46ccc190fd4451ab0 with SHA-1 a14326cf30 is already in history

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

Change-Id: Id2979c3e362c96c39136559a71b60d9c323c5136
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 05:09:53 +00:00
Sal Savage
072e3c8e79 [automerger skipped] Merge "Set default the Bluetooth class of device" am: fff19eff05 am: c0014f19cc -s ours am: ee2c2304ae -s ours am: be1686bac0 -s ours
am skip reason: Merged-In I75a6fb83a6149f58372b7aa46ccc190fd4451ab0 with SHA-1 a14326cf30 is already in history

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

Change-Id: I39ae16990acd5e98a45528038e7b05cb749e6fbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 03:55:03 +00:00
Sal Savage
be1686bac0 [automerger skipped] Merge "Set default the Bluetooth class of device" am: fff19eff05 am: c0014f19cc -s ours am: ee2c2304ae -s ours
am skip reason: Merged-In I75a6fb83a6149f58372b7aa46ccc190fd4451ab0 with SHA-1 a14326cf30 is already in history

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

Change-Id: I5a868691358b04e1b9291806e3126ef4d1bc8b59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 03:49:03 +00:00
Automerger Merge Worker
7a6624bc7f Merge "Add vendor/goodix/udfps/fp_utils to PRODUCT_SOONG_NAMESPACES am: 14e7759e0b am: 36e00562bd" into tm-d1-dev-plus-aosp am: f8c7c1ed54 am: 609089db3c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17822606

Change-Id: I238df32bce07624846d4c9f732853fc5cc6584f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 03:45:24 +00:00
Automerger Merge Worker
b0232f0cc5 Merge "Add vendor/goodix/udfps/fp_utils to PRODUCT_SOONG_NAMESPACES am: 14e7759e0b am: f6507a9d35 am: 9e3f60fbb6" into tm-qpr-dev-plus-aosp am: de12b40ceb
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17822606

Change-Id: Id82b81278c4c038212d0bbe65a45700b7054bd5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 03:43:59 +00:00
Kris Chen
0ed4e1f4cb Add vendor/goodix/udfps/fp_utils to PRODUCT_SOONG_NAMESPACES am: 14e7759e0b am: f6507a9d35 am: df8ea6e131 am: 5bc9904a77
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17822606

Change-Id: Ia0d9878507b16a8027cda43af9ba98ffbba61a6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 03:41:47 +00:00
Sal Savage
ee2c2304ae [automerger skipped] Merge "Set default the Bluetooth class of device" am: fff19eff05 am: c0014f19cc -s ours
am skip reason: Merged-In I75a6fb83a6149f58372b7aa46ccc190fd4451ab0 with SHA-1 a14326cf30 is already in history

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

Change-Id: I16223e4869a91984f4c9104cd0b8e655dc0d70e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 03:19:47 +00:00
Automerger Merge Worker
609089db3c Merge "Add vendor/goodix/udfps/fp_utils to PRODUCT_SOONG_NAMESPACES am: 14e7759e0b am: 36e00562bd" into tm-d1-dev-plus-aosp am: f8c7c1ed54
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17822606

Change-Id: Ic60fe571038bbff6b989295bbd579c202f931e47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 03:19:15 +00:00
Automerger Merge Worker
de12b40ceb Merge "Add vendor/goodix/udfps/fp_utils to PRODUCT_SOONG_NAMESPACES am: 14e7759e0b am: f6507a9d35 am: 9e3f60fbb6" into tm-qpr-dev-plus-aosp 2022-05-05 03:18:07 +00:00
Kris Chen
5bc9904a77 Add vendor/goodix/udfps/fp_utils to PRODUCT_SOONG_NAMESPACES am: 14e7759e0b am: f6507a9d35 am: df8ea6e131
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17822606

Change-Id: I50cf53d8f1d70e0ea2b5e677487b6c9a764f6b9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 03:17:50 +00:00
Kris Chen
0fccb867f3 Add vendor/goodix/udfps/fp_utils to PRODUCT_SOONG_NAMESPACES am: 14e7759e0b am: f6507a9d35 am: 9e3f60fbb6
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17822606

Change-Id: I8c6032349fe0c16ff2435123562daf26701f5347
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 03:17:49 +00:00
Automerger Merge Worker
f8c7c1ed54 Merge "Add vendor/goodix/udfps/fp_utils to PRODUCT_SOONG_NAMESPACES am: 14e7759e0b am: 36e00562bd" into tm-d1-dev-plus-aosp 2022-05-05 02:44:35 +00:00
Kris Chen
90f8136c5b Add vendor/goodix/udfps/fp_utils to PRODUCT_SOONG_NAMESPACES am: 14e7759e0b am: 36e00562bd
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17822606

Change-Id: I9f93a7466053f59b9949f704c9e43f4d1cccf4e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 02:44:20 +00:00
Kris Chen
df8ea6e131 Add vendor/goodix/udfps/fp_utils to PRODUCT_SOONG_NAMESPACES am: 14e7759e0b am: f6507a9d35
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17822606

Change-Id: I95c1e8894282efcb24c94513421fc2ba6cb74358
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 02:44:19 +00:00
Kris Chen
9e3f60fbb6 Add vendor/goodix/udfps/fp_utils to PRODUCT_SOONG_NAMESPACES am: 14e7759e0b am: f6507a9d35
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17822606

Change-Id: I1221a6e0c049946945d3676cfe8fb6a370eea7a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 02:44:17 +00:00
Sal Savage
c0014f19cc Merge "Set default the Bluetooth class of device" am: fff19eff05
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2084046

Change-Id: Ia6182eac0124c5fb5b604eaaf27a187ad7293a85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 02:40:17 +00:00
Kris Chen
f6507a9d35 Add vendor/goodix/udfps/fp_utils to PRODUCT_SOONG_NAMESPACES am: 14e7759e0b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17822606

Change-Id: I42fc5315cd8e91caaf273e62e22e0b244b7fb6bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 02:19:25 +00:00
Kris Chen
f3a2562971 Add vendor/goodix/udfps/fp_utils to PRODUCT_SOONG_NAMESPACES am: 14e7759e0b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17822606

Change-Id: I2471c453a6996fe15b3253c10326353ec89e7beb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 02:18:56 +00:00
Kris Chen
36e00562bd Add vendor/goodix/udfps/fp_utils to PRODUCT_SOONG_NAMESPACES am: 14e7759e0b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17822606

Change-Id: I14871a1609dbc8979b91be9cea9774f4b64c9990
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 02:18:00 +00:00
Sal Savage
fff19eff05 Merge "Set default the Bluetooth class of device" 2022-05-05 02:11:16 +00:00
Kris Chen
14e7759e0b Add vendor/goodix/udfps/fp_utils to PRODUCT_SOONG_NAMESPACES
Bug: 229716695
Test: build and test fingerprint on device.
Change-Id: I017fef77de4709e1767f6e05e3b794b391969659
2022-05-05 02:03:43 +00:00
Will McVicker
f82dc86cf6 init.gs101.rc: add raw i2c-s2mpg10mfd and i2c-s2mpg11mfd nodes am: ef12b21ded am: d1ba75fda2 am: cb0cd08487 am: a95e7e9fc3
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18124408

Change-Id: I26d7d437c749b8c561df84487bb68e48fba1ffb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 18:26:12 +00:00
Will McVicker
21e344c7d1 init.gs101.rc: add raw i2c-s2mpg10mfd and i2c-s2mpg11mfd nodes am: ef12b21ded am: 5b92744dd5 am: a17b411a39 am: df8884460e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18124408

Change-Id: I5c131da18ac81548253c8e888e19c8aa126f955f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 18:25:59 +00:00
Roger Wang
47c31e0423 wlan: Disable 6GHz softAp am: 8c7b81d1d3 am: c78092d7dd am: 524e6ad4ee am: b3d89b9b5d
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18154286

Change-Id: Idbf177b7ee9c7e24bee7f3889d7f2e3dd979e906
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 18:25:24 +00:00
Will McVicker
fade221ddd init.gs101.rc: add raw i2c-s2mpg10mfd and i2c-s2mpg11mfd nodes am: ef12b21ded am: d1ba75fda2 am: 365d2a3116 am: 4ff62b16b5
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18124408

Change-Id: Ie8202ec27b8d232ac8ceeea7fb87c1137b1e6b66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 18:24:12 +00:00
Roger Wang
402541ae33 wlan: Disable 6GHz softAp am: 8c7b81d1d3 am: c4bacfb35f am: ec8a921561 am: ae53419dca
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18154286

Change-Id: Iccac12ecd0411b710868c386df1a72f2a7945c33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 18:23:04 +00:00
Roger Wang
591b29967e wlan: Disable 6GHz softAp am: 8c7b81d1d3 am: c4bacfb35f am: 68b322d862 am: 31cdcc5220
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18154286

Change-Id: Ib8db8f71ae0c3574dc56290f919bb016fa854509
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 18:21:50 +00:00
Will McVicker
a95e7e9fc3 init.gs101.rc: add raw i2c-s2mpg10mfd and i2c-s2mpg11mfd nodes am: ef12b21ded am: d1ba75fda2 am: cb0cd08487
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18124408

Change-Id: Ib9ba6ab13b51443bd99f17f7e9fc82b0908851b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:55:01 +00:00
Will McVicker
df8884460e init.gs101.rc: add raw i2c-s2mpg10mfd and i2c-s2mpg11mfd nodes am: ef12b21ded am: 5b92744dd5 am: a17b411a39
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18124408

Change-Id: If415a48d8005735d1b958af06b8a1dc7c157923f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:54:35 +00:00
Roger Wang
b3d89b9b5d wlan: Disable 6GHz softAp am: 8c7b81d1d3 am: c78092d7dd am: 524e6ad4ee
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18154286

Change-Id: I85efffe594a00203d6e9161d28e479aa187afeb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:53:52 +00:00
Will McVicker
4ff62b16b5 init.gs101.rc: add raw i2c-s2mpg10mfd and i2c-s2mpg11mfd nodes am: ef12b21ded am: d1ba75fda2 am: 365d2a3116
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18124408

Change-Id: I7c52b69363b41cdd976e5848d35d5dd484d41cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:53:42 +00:00
Roger Wang
ae53419dca wlan: Disable 6GHz softAp am: 8c7b81d1d3 am: c4bacfb35f am: ec8a921561
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18154286

Change-Id: I07737f437ca8ad3fe5de982a48f5938278dc75b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:53:34 +00:00
Roger Wang
31cdcc5220 wlan: Disable 6GHz softAp am: 8c7b81d1d3 am: c4bacfb35f am: 68b322d862
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18154286

Change-Id: Ia172a1adb66d27e518420b1be6b459a809b183cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:52:50 +00:00
Will McVicker
82795f1e24 init.gs101.rc: add raw i2c-s2mpg10mfd and i2c-s2mpg11mfd nodes am: ef12b21ded am: c9079972ca
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18124408

Change-Id: I254468b8be8072851d5c32e573fc2374e266110a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:14:11 +00:00
Will McVicker
cb0cd08487 init.gs101.rc: add raw i2c-s2mpg10mfd and i2c-s2mpg11mfd nodes am: ef12b21ded am: d1ba75fda2
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18124408

Change-Id: Ie6caa955e160d475bc6c9619ac7843196a9c79c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:12:51 +00:00
Roger Wang
68b322d862 wlan: Disable 6GHz softAp am: 8c7b81d1d3 am: c4bacfb35f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18154286

Change-Id: Ie33c7e0c80fc8f652fc124fecfb43cdcf9908030
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:12:41 +00:00
Will McVicker
a17b411a39 init.gs101.rc: add raw i2c-s2mpg10mfd and i2c-s2mpg11mfd nodes am: ef12b21ded am: 5b92744dd5
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18124408

Change-Id: I9c90f3f2f8444049b19b0ca5c872289d1c1d7d6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:11:45 +00:00
Roger Wang
524e6ad4ee wlan: Disable 6GHz softAp am: 8c7b81d1d3 am: c78092d7dd
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18154286

Change-Id: Id0d027dcbebffc3bf7a8b4d5a208c686b22bef04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:11:35 +00:00
Roger Wang
5ff2dcb2d0 wlan: Disable 6GHz softAp am: 8c7b81d1d3 am: c01d662e44
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18154286

Change-Id: I20e7eef8f4e72b54c43625e0a14ebc739820d1cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:10:51 +00:00
Will McVicker
365d2a3116 init.gs101.rc: add raw i2c-s2mpg10mfd and i2c-s2mpg11mfd nodes am: ef12b21ded am: d1ba75fda2
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18124408

Change-Id: Ic2c8ce9674ea869d4182632e8e91fd4a1e61d1fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:10:26 +00:00
Roger Wang
ec8a921561 wlan: Disable 6GHz softAp am: 8c7b81d1d3 am: c4bacfb35f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18154286

Change-Id: I7f9400781e7b7cc4e62ce9b38d27a01a4c74ce20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:10:18 +00:00
Will McVicker
d1ba75fda2 init.gs101.rc: add raw i2c-s2mpg10mfd and i2c-s2mpg11mfd nodes am: ef12b21ded
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18124408

Change-Id: I2f165ed52a4d5b7af08922af720813a9682d9e4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 16:39:32 +00:00
Will McVicker
5b92744dd5 init.gs101.rc: add raw i2c-s2mpg10mfd and i2c-s2mpg11mfd nodes am: ef12b21ded
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18124408

Change-Id: I886c1d76ed20a6118da8fe271299e9d31cda505c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 16:38:59 +00:00
Will McVicker
c9079972ca init.gs101.rc: add raw i2c-s2mpg10mfd and i2c-s2mpg11mfd nodes am: ef12b21ded
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18124408

Change-Id: Ic7694c0f371547b2052702de3ef9d25f7ad87f05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 16:38:52 +00:00
Roger Wang
c78092d7dd wlan: Disable 6GHz softAp am: 8c7b81d1d3
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18154286

Change-Id: I22f52cb0a711cd2434ae337f0e249abee28bfffd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 16:38:48 +00:00
Roger Wang
c01d662e44 wlan: Disable 6GHz softAp am: 8c7b81d1d3
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18154286

Change-Id: I17f6692809efa2a8ea1715edded33705fbc3cafd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 16:38:42 +00:00
Roger Wang
c4bacfb35f wlan: Disable 6GHz softAp am: 8c7b81d1d3
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18154286

Change-Id: I4b754e2abe5d6dff14efc2f249a211a861510448
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 16:38:36 +00:00
Will McVicker
ef12b21ded init.gs101.rc: add raw i2c-s2mpg10mfd and i2c-s2mpg11mfd nodes
This fixes the permissions for the [067]-001f and [178]-002f raw i2c
numberings for the P21-mainline driver which doesn't use the i2c vendor
hook to rename these numberings. This is required for the thermal hal to
work.

Bug: 231155356
Signed-off-by: Will McVicker <willmcvicker@google.com>
Change-Id: I2341c78b2ab146713a171eeb436f34c1c8839c6e
2022-05-04 16:10:15 +00:00
Roger Wang
8c7b81d1d3 wlan: Disable 6GHz softAp
Driver actually does not support 6Ghz softAp at
current version. Hence, disable it

Bug: 231384422
Test: SoftAp can be enabled.
Change-Id: I47b39f3d31c1a94de338a2a22dc5b5495b1af1a1
2022-05-04 15:49:33 +00:00
Ray Chi
0195f4cd4c usb: remove set_usb_irq script for irq change am: a5f995d2f6 am: b0e42703dc am: 695c9b2538 am: 206b3a84dd am: 50f6a71d77
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2086725

Change-Id: I1b2827ff1a4ef88952f20dbd693844a564af06b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 10:43:37 +00:00