Android Build Coastguard Worker
2700bbff28
Snap for 8500011 from d77490ac35
to udc-release
...
Change-Id: If4be1b49062f8d0d2be9726b340760e0e4e57d26
2022-04-26 03:16:51 +00:00
Android Build Coastguard Worker
5c54babe46
Snap for 8499686 from ce9952f278
to tm-qpr1-release
...
Change-Id: I330ba8278c7a8cb916bc12df9aad98bcc5fac34d
2022-04-26 03:10:58 +00:00
Sayanna Chandula
d77490ac35
thermal: enable thermal engine for evt1.0 devices am: aba15a7cb6
am: 3034dc8a6c
am: 18c661d96a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903066
Change-Id: I95b84e3018f55b6eecb59abcf9d60bb9c9dce892
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 19:58:33 +00:00
Sayanna Chandula
4a836cc5ba
thermal: enable thermal engine for evt1.0 devices am: aba15a7cb6
am: ce9952f278
am: 3a4c107ae2
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903066
Change-Id: Ib25b065a57e29aa24d85165d560b4f88f5e2a3cf
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 19:56:48 +00:00
Sayanna Chandula
18c661d96a
thermal: enable thermal engine for evt1.0 devices am: aba15a7cb6
am: 3034dc8a6c
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903066
Change-Id: I47d8a1c15560ab73a2975e8cfd42ba910d92b4fe
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 19:07:10 +00:00
Sayanna Chandula
3a4c107ae2
thermal: enable thermal engine for evt1.0 devices am: aba15a7cb6
am: ce9952f278
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903066
Change-Id: I6cf4902ee4bc00d6fecf002866adf0884f931966
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 19:06:29 +00:00
Sayanna Chandula
ce9952f278
thermal: enable thermal engine for evt1.0 devices am: aba15a7cb6
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903066
Change-Id: I56b1c6285e53719e75e1445b9f2ffd28799c11cc
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 18:52:08 +00:00
Sayanna Chandula
3034dc8a6c
thermal: enable thermal engine for evt1.0 devices am: aba15a7cb6
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903066
Change-Id: Ic53061c9602bb0c86cfbdaa4922a9a4c8b20a246
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 18:51:48 +00:00
Sayanna Chandula
aba15a7cb6
thermal: enable thermal engine for evt1.0 devices
...
Currently thermal engine is disabled on A0 based devices using a
separate config file, thermal_info_config-A0.json.
This change removes that restriction so that thermal engine can
be enabled for EVT1.0 devices using device specific rc file.
Bug: 196478280
Test: Build and boot on device. Check thermal config
Signed-off-by: Sayanna Chandula <sayanna@google.com>
Change-Id: I2171f38802b3770317dfb9a3b2106e613c0ccdb4
2022-04-25 18:20:58 +00:00
SalmaxChang
75480b868e
init: restorecon modem persist file am: 63024e0a54
am: 80dec4ee44
am: e11b2ddd5a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17914312
Change-Id: Ie7c8156525e132a9f42efdbb9bd2145f03ee8e89
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 15:37:33 +00:00
SalmaxChang
217a017f60
init: restorecon modem persist file am: 63024e0a54
am: 50a2976c93
am: 95bec958f8
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17914312
Change-Id: Ib12fe53da8ac27ca03b4c3c59d8684e53443342d
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 15:37:25 +00:00
SalmaxChang
e11b2ddd5a
init: restorecon modem persist file am: 63024e0a54
am: 80dec4ee44
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17914312
Change-Id: I8bc143cb26cb13c08e0e68b514d80b118800c150
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 15:03:39 +00:00
SalmaxChang
95bec958f8
init: restorecon modem persist file am: 63024e0a54
am: 50a2976c93
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17914312
Change-Id: Ia78a4f2c9de1c772973563a365925164603ef32b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 15:03:19 +00:00
SalmaxChang
80dec4ee44
init: restorecon modem persist file am: 63024e0a54
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17914312
Change-Id: Ie595c6a09324631ac635fa92059387502b571333
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 14:46:33 +00:00
SalmaxChang
50a2976c93
init: restorecon modem persist file am: 63024e0a54
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17914312
Change-Id: I460d8561bb03be03d211e5cdd25cd10b0a928467
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 14:46:32 +00:00
SalmaxChang
63024e0a54
init: restorecon modem persist file
...
Relabel the selinux context of modem persist file
Bug: 230289342
Change-Id: I04248cac4a247d6376686a6451251da3799cf64b
2022-04-25 14:15:30 +00:00
Kris Chen
a40e47b24d
Remove the temporary FCM setting for fingerprint am: 8efde59fb6
am: acd686d881
am: 2dfd438649
am: c01d75684e
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903536
Change-Id: I39a9c7e3e4005da7e08c0fe1db20d25b05da085a
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 08:06:47 +00:00
Automerger Merge Worker
5a319fc64e
Merge "Remove the temporary FCM setting for fingerprint am: 8efde59fb6
am: acd686d881
am: 5a56fe719b
" into tm-qpr-dev-plus-aosp am: 0e4253a926
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903536
Change-Id: Ie134d337269fd7b023f8be40893e9db2827ce612
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 08:06:40 +00:00
Kris Chen
8fac419286
Remove the temporary FCM setting for fingerprint am: 8efde59fb6
am: 3606098bd0
am: 0ae0ac25f4
am: f294ae9092
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903536
Change-Id: I1d1997ba5922e46bff9934c236a41fb92dca2f38
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 08:06:32 +00:00
Kris Chen
c01d75684e
Remove the temporary FCM setting for fingerprint am: 8efde59fb6
am: acd686d881
am: 2dfd438649
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903536
Change-Id: I5a0ea34f6927677d13975578c3740c5bbd90dd92
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 07:41:11 +00:00
Automerger Merge Worker
0e4253a926
Merge "Remove the temporary FCM setting for fingerprint am: 8efde59fb6
am: acd686d881
am: 5a56fe719b
" into tm-qpr-dev-plus-aosp
2022-04-25 07:41:01 +00:00
Kris Chen
f294ae9092
Remove the temporary FCM setting for fingerprint am: 8efde59fb6
am: 3606098bd0
am: 0ae0ac25f4
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903536
Change-Id: I4ed6caaebc2b0c20141068bf7a7036faca4db73b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 07:40:58 +00:00
Kris Chen
1c563356e9
Remove the temporary FCM setting for fingerprint am: 8efde59fb6
am: acd686d881
am: 5a56fe719b
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903536
Change-Id: I224bfcb4a1b510109c6bcaffc105e7aeea421b59
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 07:40:58 +00:00
Kris Chen
2dfd438649
Remove the temporary FCM setting for fingerprint am: 8efde59fb6
am: acd686d881
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903536
Change-Id: Ifa30fd78f951b9e297b367b9b849eb2024245695
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 07:27:41 +00:00
Kris Chen
5a56fe719b
Remove the temporary FCM setting for fingerprint am: 8efde59fb6
am: acd686d881
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903536
Change-Id: I16848898e800b47f518fd783c0c992a3dd9a6c2c
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 07:27:38 +00:00
Kris Chen
0ae0ac25f4
Remove the temporary FCM setting for fingerprint am: 8efde59fb6
am: 3606098bd0
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903536
Change-Id: I54e1e39655800c84c7405f3707d472228a4955db
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 07:27:22 +00:00
Kris Chen
82430bf13e
Remove the temporary FCM setting for fingerprint am: 8efde59fb6
am: 455d7996ea
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903536
Change-Id: Id1bf182e5d78528a083a3f956022bdf551b8b8ac
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 07:26:57 +00:00
Kris Chen
acd686d881
Remove the temporary FCM setting for fingerprint am: 8efde59fb6
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903536
Change-Id: I6438364945da918d17c66b053db638cce8b8d56f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 06:53:52 +00:00
Kris Chen
455d7996ea
Remove the temporary FCM setting for fingerprint am: 8efde59fb6
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903536
Change-Id: I126f16f9d902e6a961abfc047c97c1c93f881a02
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 06:52:52 +00:00
Kris Chen
3606098bd0
Remove the temporary FCM setting for fingerprint am: 8efde59fb6
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903536
Change-Id: Id5ae7af23818addefeb052c9396ab0bd45194eae
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 06:52:31 +00:00
Kris Chen
8efde59fb6
Remove the temporary FCM setting for fingerprint
...
Bug: 223118104
Test: m check-vintf-all
Test: atest vts_treble_vintf_vendor_test
Change-Id: I08de753408d4ae1ec503ad8037d3dfd22d400e80
2022-04-25 06:28:09 +00:00
Automerger Merge Worker
0b229767db
Merge "Revert "powerstats: set time limit as timeout for AoC" am: f2fa5042d8
am: 2e9ed2e2fc
" into tm-d1-dev-plus-aosp am: 29dde30afd
am: 05433d666e
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17935513
Change-Id: I2e539b8a724607aefd83109c5b8250cb25122782
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 05:27:31 +00:00
Kelly Rossmoyer
027173368e
Revert "powerstats: set time limit as timeout for AoC" am: f2fa5042d8
am: c5c3bcc194
am: 88b513c3ce
am: 2ec8a22556
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17935513
Change-Id: Ifdcecc651e857506a7e2ad369b06c81be04dc84c
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 05:27:09 +00:00
Kelly Rossmoyer
0434882fe2
Revert "powerstats: set time limit as timeout for AoC" am: f2fa5042d8
am: c5c3bcc194
am: a786fe58f5
am: 0d5cabdc4d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17935513
Change-Id: I4f77301f4645f9c3c01d04bccf00c3f442f7b146
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 05:26:48 +00:00
Automerger Merge Worker
05433d666e
Merge "Revert "powerstats: set time limit as timeout for AoC" am: f2fa5042d8
am: 2e9ed2e2fc
" into tm-d1-dev-plus-aosp am: 29dde30afd
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17935513
Change-Id: If59c8da7d7830ce5c6e88c41a8a90010ad2d6d87
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 05:02:57 +00:00
Kelly Rossmoyer
2ec8a22556
Revert "powerstats: set time limit as timeout for AoC" am: f2fa5042d8
am: c5c3bcc194
am: 88b513c3ce
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17935513
Change-Id: I6c5b4c8431fae2f74f47cfe88b441158d5c595df
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 05:02:32 +00:00
Kelly Rossmoyer
0d5cabdc4d
Revert "powerstats: set time limit as timeout for AoC" am: f2fa5042d8
am: c5c3bcc194
am: a786fe58f5
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17935513
Change-Id: I46b7f6bf63f3b91e051413f105b85e9da074b988
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 05:02:13 +00:00
Automerger Merge Worker
29dde30afd
Merge "Revert "powerstats: set time limit as timeout for AoC" am: f2fa5042d8
am: 2e9ed2e2fc
" into tm-d1-dev-plus-aosp
2022-04-25 04:42:03 +00:00
Kelly Rossmoyer
88b513c3ce
Revert "powerstats: set time limit as timeout for AoC" am: f2fa5042d8
am: c5c3bcc194
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17935513
Change-Id: I86274715d9833a603bca8daf7863c0700b9eb666
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 04:41:54 +00:00
Kelly Rossmoyer
d57d626ed4
Revert "powerstats: set time limit as timeout for AoC" am: f2fa5042d8
am: 2e9ed2e2fc
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17935513
Change-Id: If4dcad66da023c47ab3c6f731ff4ec8dd8842eef
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 04:41:54 +00:00
Kelly Rossmoyer
a786fe58f5
Revert "powerstats: set time limit as timeout for AoC" am: f2fa5042d8
am: c5c3bcc194
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17935513
Change-Id: Ic076f020425cbe899e69aeadc241c67d93c33f32
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 04:41:53 +00:00
Kelly Rossmoyer
87828e886c
Revert "powerstats: set time limit as timeout for AoC" am: f2fa5042d8
am: 3c10ced256
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17935513
Change-Id: Ic2ffa5339a5395c25a40bd5f6e08ad18c63c05bb
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 04:41:25 +00:00
Kelly Rossmoyer
c5c3bcc194
Revert "powerstats: set time limit as timeout for AoC" am: f2fa5042d8
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17935513
Change-Id: I0391ca469cfcbf250e449ac51ca1f9bcbcf82df2
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 04:18:16 +00:00
Kelly Rossmoyer
3c10ced256
Revert "powerstats: set time limit as timeout for AoC" am: f2fa5042d8
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17935513
Change-Id: Ie17692db5a2046693066c9d6d1de99cbb93c5137
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 04:17:11 +00:00
Kelly Rossmoyer
2e9ed2e2fc
Revert "powerstats: set time limit as timeout for AoC" am: f2fa5042d8
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17935513
Change-Id: I120d7274368d7d4c517999b6375f9f8cad02552a
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 04:16:51 +00:00
Kelly Rossmoyer
f2fa5042d8
Revert "powerstats: set time limit as timeout for AoC"
...
Revert "powerstats: timeout mechanism for AoC data provider"
Revert submission 17800080-power-stats-aoc-timeout
Reason for revert: Causing crashes due to improper thread sync
Reverted Changes:
I71a9e6817:powerstats: timeout mechanism for AoC data provide...
I725c00745:powerstats: set time limit as timeout for AoC
I5b290a53d:powerstats: set time limit as timeout for AoC
Change-Id: I84f5173aada0539d8c91d18d36a841bc9f3e3c9a
2022-04-25 03:56:51 +00:00
Kyle Tso
5117fa4518
usb: Modify the controller name am: ef25209b6b
am: 1c35126bb5
am: ff01edec30
am: ac479cdec2
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903535
Change-Id: If3f32d8bcb64d4ce4caeafa1b2200ff7e3c09871
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 03:22:25 +00:00
Kyle Tso
c8c57227c2
usb: Modify the controller name am: ef25209b6b
am: 1c35126bb5
am: 296cd4eb8e
am: 6948b3ca99
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903535
Change-Id: Ibf2174896d27b0be8f9b907aef3e111ee1fc5598
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 03:22:12 +00:00
Kyle Tso
edfa3987ab
usb: Modify the controller name am: ef25209b6b
am: e59b3f652f
am: 9e4b0c30b5
am: addd9ea95f
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903535
Change-Id: I873e3f977129665abb165cc4c87abb7909089fde
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 03:21:56 +00:00
Kyle Tso
ac479cdec2
usb: Modify the controller name am: ef25209b6b
am: 1c35126bb5
am: ff01edec30
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903535
Change-Id: Ib4b6c90828d765e63eab5cdf87fa18e688f58756
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 03:20:53 +00:00