David Chao
fb574fe307
gs101: move charger thermal HAL setup into common code am: 980650080a
am: 0d8627b8eb
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17346883
Change-Id: I161ed3eeb5eee8fe9785fd25d05e4d3fa4b4177c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 08:30:03 +00:00
David Chao
0d8627b8eb
gs101: move charger thermal HAL setup into common code am: 980650080a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17346883
Change-Id: Ib523f7c3c9c56de655fec1cc964bc218c495145e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 08:11:29 +00:00
David Chao
a0b8268a58
gs101: move charger thermal HAL setup into common code am: 980650080a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17346883
Change-Id: I690637db2039a1da218a7606c121bbeed1952ade
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 08:10:17 +00:00
David Chao
10655880ef
gs101: move charger thermal HAL setup into common code am: 980650080a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17346883
Change-Id: Ib7040ab1ba045b0f677e39f44d5ca2f49a57bf22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 08:10:09 +00:00
David Chao
980650080a
gs101: move charger thermal HAL setup into common code
...
Bug: 200615564
Test: build pass
Change-Id: I5a32c2b695dc9fd3e29e580c8a82e25f6c3a5f69
2022-05-25 07:46:52 +00:00
Jinting Lin
1ce3123f4b
Update pixel stability logging mask am: b3786e5827
am: 50385396c9
am: 26e211111a
am: e61f5307c1
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18451306
Change-Id: I41afb43a8aa5e811ad9a7cbf4751440c1ccd195e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 04:15:39 +00:00
Automerger Merge Worker
68d863e216
Merge "Update pixel stability logging mask am: b3786e5827
am: 50385396c9
am: 62bfe07793
" into tm-qpr-dev-plus-aosp am: ca58586a09
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18451306
Change-Id: I695cc7d98461481d9ee9effa1bcf49bef9415dc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 04:14:27 +00:00
Jinting Lin
974003e0ce
Update pixel stability logging mask am: b3786e5827
am: 408298fd21
am: 7d680d6a57
am: 41425f4d33
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18451306
Change-Id: I8792c6bc9a39fe53a37d40671ad2fe663348e741
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 04:12:27 +00:00
Jinting Lin
e61f5307c1
Update pixel stability logging mask am: b3786e5827
am: 50385396c9
am: 26e211111a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18451306
Change-Id: Iea7b375f9ba95ecc27f0e4d2031af63b094d5e76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 03:54:47 +00:00
Automerger Merge Worker
ca58586a09
Merge "Update pixel stability logging mask am: b3786e5827
am: 50385396c9
am: 62bfe07793
" into tm-qpr-dev-plus-aosp
2022-05-25 03:53:47 +00:00
Jinting Lin
3655e41067
Update pixel stability logging mask am: b3786e5827
am: 50385396c9
am: 62bfe07793
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18451306
Change-Id: I678a893de4226e697cb77009a47757867d32b17c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 03:53:44 +00:00
Jinting Lin
41425f4d33
Update pixel stability logging mask am: b3786e5827
am: 408298fd21
am: 7d680d6a57
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18451306
Change-Id: Ibb5deef4ad3a67e9b71583a860b861b209d74378
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 03:53:43 +00:00
Jinting Lin
26e211111a
Update pixel stability logging mask am: b3786e5827
am: 50385396c9
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18451306
Change-Id: I213aa09468c3d477045fad28c229a84eea8d8ce9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 03:18:07 +00:00
Jinting Lin
62bfe07793
Update pixel stability logging mask am: b3786e5827
am: 50385396c9
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18451306
Change-Id: I442e6eb3e2ace66e90edcf5640112fe005523eaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 03:17:44 +00:00
Jinting Lin
7d680d6a57
Update pixel stability logging mask am: b3786e5827
am: 408298fd21
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18451306
Change-Id: I3ee94319e0087b6d069d7cca983fc53560c638f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 03:17:35 +00:00
Jinting Lin
50385396c9
Update pixel stability logging mask am: b3786e5827
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18451306
Change-Id: I67735e49a5623357b9f02c43b4d2a42ec66670c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 02:51:24 +00:00
Jinting Lin
408298fd21
Update pixel stability logging mask am: b3786e5827
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18451306
Change-Id: Ia727bd4557e0ad0d53f82b42ac334dfa7e742b8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 02:50:17 +00:00
Jinting Lin
498038b5d2
Update pixel stability logging mask am: b3786e5827
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18451306
Change-Id: I55cf063e142ec86f76250590d5e8d855f64d815c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 02:50:12 +00:00
Jinting Lin
b3786e5827
Update pixel stability logging mask
...
- add COMMON_HAL and PAL_PWR group
Bug: 232898035
Change-Id: I79586d9bd2b6c12cbf331dd7fb4c4da8525beee2
2022-05-25 02:32:21 +00:00
Ankit Goyal
7c68144939
Deprecate allocator 4.0 in favor of AIDL V1 am: 557e70add3
am: 65943d53bb
am: 5d549fe04f
am: 5354ad7190
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18565496
Change-Id: If243b3642b3db183876e1b09be5cf12f6f0ffd3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 23:40:10 +00:00
Ankit Goyal
d1074b1041
Deprecate allocator 4.0 in favor of AIDL V1 am: 557e70add3
am: 65943d53bb
am: b50a6e117e
am: 054384b6c5
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18565496
Change-Id: I4c1a23b611ec3a9bb7895ae987d82dd09a0075ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 23:39:34 +00:00
Ankit Goyal
6892f6a4ac
Deprecate allocator 4.0 in favor of AIDL V1 am: 557e70add3
am: 0a206733fb
am: 882758fd12
am: 5bcd548b7b
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18565496
Change-Id: I89bbc4dd776d22607405fa39a5dcdaa9dbae96a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 23:38:56 +00:00
Ankit Goyal
5354ad7190
Deprecate allocator 4.0 in favor of AIDL V1 am: 557e70add3
am: 65943d53bb
am: 5d549fe04f
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18565496
Change-Id: Ia9c73cf0ad87370ccae9dbd09937cd88bca38de6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 23:09:43 +00:00
Ankit Goyal
054384b6c5
Deprecate allocator 4.0 in favor of AIDL V1 am: 557e70add3
am: 65943d53bb
am: b50a6e117e
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18565496
Change-Id: I6d08a19fe7c4522bc96f3d48e93254982e3b50db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 23:02:55 +00:00
Ankit Goyal
5bcd548b7b
Deprecate allocator 4.0 in favor of AIDL V1 am: 557e70add3
am: 0a206733fb
am: 882758fd12
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18565496
Change-Id: I8a1c35e8e7e566f588c4709c8d0d5d643d37cd56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 23:02:39 +00:00
Android Build Coastguard Worker
dd63352314
Snap for 8637088 from 7bb4293087
to tm-release
...
Change-Id: I15964fb341e37c379b4aad9428c07d5919d59ae2
2022-05-24 23:02:26 +00:00
Ankit Goyal
b50a6e117e
Deprecate allocator 4.0 in favor of AIDL V1 am: 557e70add3
am: 65943d53bb
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18565496
Change-Id: I7010593c7cf03795766994e75fa0e556943e0de6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 22:44:55 +00:00
Ankit Goyal
5d549fe04f
Deprecate allocator 4.0 in favor of AIDL V1 am: 557e70add3
am: 65943d53bb
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18565496
Change-Id: Ib071791a62c96b757ee47c64e57bc384ce6425ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 22:44:52 +00:00
Pierre-Clément Tosi
e7b4172e1e
[automerger skipped] Revert "gs101: Add pvmfw to AB_OTA_PARTITIONS" am: 3ba1a0dd6b
am: 42cc5cd651
-s ours am: 2f4f4127ed
-s ours am: 7309b2e866
-s ours am: 7b50f2d385
-s ours
...
am skip reason: Merged-In Ib0f0ce2a2733f878bb680d16fea15cfa794b7c1d with SHA-1 871071afbc
is already in history. Merged-In was found from reverted change.
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2105125
Change-Id: Ief83fb634b3740361d413caba9fdf5703f8c9540
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 22:44:31 +00:00
Ankit Goyal
882758fd12
Deprecate allocator 4.0 in favor of AIDL V1 am: 557e70add3
am: 0a206733fb
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18565496
Change-Id: I5eb0531afdf1e17d56b1c4b2f6a84c47add1e278
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 22:34:52 +00:00
Pierre-Clément Tosi
7b50f2d385
[automerger skipped] Revert "gs101: Add pvmfw to AB_OTA_PARTITIONS" am: 3ba1a0dd6b
am: 42cc5cd651
-s ours am: 2f4f4127ed
-s ours am: 7309b2e866
-s ours
...
am skip reason: Merged-In Ib0f0ce2a2733f878bb680d16fea15cfa794b7c1d with SHA-1 871071afbc
is already in history. Merged-In was found from reverted change.
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2105125
Change-Id: Iaa56cd50f713886d58e3a986144fe6c3404e81f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 22:23:43 +00:00
Ankit Goyal
65943d53bb
Deprecate allocator 4.0 in favor of AIDL V1 am: 557e70add3
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18565496
Change-Id: Ibbd9ea7916da71f4c7c5fabc9ba4b07008173350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 22:15:14 +00:00
Ankit Goyal
796090e8d3
Deprecate allocator 4.0 in favor of AIDL V1 am: 557e70add3
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18565496
Change-Id: I30d008ea59908475cfd797fa5314dbf3489cb25d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 22:13:58 +00:00
Ankit Goyal
0a206733fb
Deprecate allocator 4.0 in favor of AIDL V1 am: 557e70add3
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18565496
Change-Id: I515c675bcfa82b520d9c0588f0a264ba41b0d794
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 22:13:41 +00:00
Pierre-Clément Tosi
7309b2e866
[automerger skipped] Revert "gs101: Add pvmfw to AB_OTA_PARTITIONS" am: 3ba1a0dd6b
am: 42cc5cd651
-s ours am: 2f4f4127ed
-s ours
...
am skip reason: Merged-In Ib0f0ce2a2733f878bb680d16fea15cfa794b7c1d with SHA-1 871071afbc
is already in history. Merged-In was found from reverted change.
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2105125
Change-Id: I82f9ca1706fe21bc1d623d452a6d8d0696a83ef8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 21:47:54 +00:00
Ankit Goyal
557e70add3
Deprecate allocator 4.0 in favor of AIDL V1
...
Bug: 220910504
Bug: 228405226
Fix: 233412845
Test: go/allocator4-deprecate
Change-Id: Ie6826b539fb1c780f4860acce440765ee3f99517
2022-05-24 21:42:02 +00:00
Pierre-Clément Tosi
2f4f4127ed
[automerger skipped] Revert "gs101: Add pvmfw to AB_OTA_PARTITIONS" am: 3ba1a0dd6b
am: 42cc5cd651
-s ours
...
am skip reason: Merged-In Ib0f0ce2a2733f878bb680d16fea15cfa794b7c1d with SHA-1 871071afbc
is already in history. Merged-In was found from reverted change.
Reverted change: https://android-review.googlesource.com/c/device/google/gs101/+/2105124
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2105125
Change-Id: I7d34ff26c9f3e237df605dcaf37319ab62373b6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 21:21:49 +00:00
Pierre-Clément Tosi
42cc5cd651
Revert "gs101: Add pvmfw to AB_OTA_PARTITIONS" am: 3ba1a0dd6b
...
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2105125
Change-Id: I42565f0acc744669c6c335543a6f1470ad326d4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 20:55:01 +00:00
Akilesh Kailash
1bc188154e
Revert "gs101: Enable system_dlkm dynamic partition" am: 7bb4293087
am: 40af2bb4a4
am: 6e8f1e79f6
am: 6531b80fde
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18513552
Change-Id: I978613ded0adf8d859cd47b34bd0dbc96bfedb43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 20:20:36 +00:00
Pierre-Clément Tosi
d66b840014
[automerger skipped] gs101: Add pvmfw to AB_OTA_PARTITIONS am: e571bb8979
am: eb06e70e62
-s ours am: e1b6c20722
-s ours am: acd4358296
-s ours am: 6a33389a9e
-s ours
...
am skip reason: Merged-In Ib0f0ce2a2733f878bb680d16fea15cfa794b7c1d with SHA-1 871071afbc
is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2105124
Change-Id: I4cc148319e77dc59ad1b1fd5dbcbea5342b50cc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 20:20:19 +00:00
Akilesh Kailash
dd1dd69a86
Revert "gs101: Enable system_dlkm dynamic partition" am: 7bb4293087
am: b66b02b5c5
am: 425a0b3b8d
am: 8c3677011a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18513552
Change-Id: If72edd838987784ad3ddb5e082f0c0eb5725953e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 20:19:22 +00:00
Akilesh Kailash
89bfa8d6fb
Revert "gs101: Enable system_dlkm dynamic partition" am: 7bb4293087
am: 40af2bb4a4
am: 3f5f295fe3
am: 4a4ecfbb6c
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18513552
Change-Id: I211c9da335d036f602b5452c52bae9722c86fa9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 20:18:23 +00:00
Akilesh Kailash
6531b80fde
Revert "gs101: Enable system_dlkm dynamic partition" am: 7bb4293087
am: 40af2bb4a4
am: 6e8f1e79f6
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18513552
Change-Id: Ia3bc64cfa80f60ee62699e2d24c3ebad41cfed2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 19:38:48 +00:00
Pierre-Clément Tosi
6a33389a9e
[automerger skipped] gs101: Add pvmfw to AB_OTA_PARTITIONS am: e571bb8979
am: eb06e70e62
-s ours am: e1b6c20722
-s ours am: acd4358296
-s ours
...
am skip reason: Merged-In Ib0f0ce2a2733f878bb680d16fea15cfa794b7c1d with SHA-1 871071afbc
is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2105124
Change-Id: Ia4b3eb8edf5815c44506a546cb169729a1bb0f28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 19:38:27 +00:00
Akilesh Kailash
8c3677011a
Revert "gs101: Enable system_dlkm dynamic partition" am: 7bb4293087
am: b66b02b5c5
am: 425a0b3b8d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18513552
Change-Id: I7b0a94d351e313d781868e5a52dfaf197017d357
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 19:37:55 +00:00
Akilesh Kailash
4a4ecfbb6c
Revert "gs101: Enable system_dlkm dynamic partition" am: 7bb4293087
am: 40af2bb4a4
am: 3f5f295fe3
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18513552
Change-Id: Ide433b398c29a44fd970686374ac51114ae8ebc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 19:37:04 +00:00
Akilesh Kailash
3f5f295fe3
Revert "gs101: Enable system_dlkm dynamic partition" am: 7bb4293087
am: 40af2bb4a4
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18513552
Change-Id: Ic62d681a3149d2740b1971259bcbaab7b7f7a9da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 19:12:48 +00:00
Akilesh Kailash
6e8f1e79f6
Revert "gs101: Enable system_dlkm dynamic partition" am: 7bb4293087
am: 40af2bb4a4
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18513552
Change-Id: I3458052fafe4f06ee6c8a50990ad39d7ff819905
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 19:12:48 +00:00
Pierre-Clément Tosi
acd4358296
[automerger skipped] gs101: Add pvmfw to AB_OTA_PARTITIONS am: e571bb8979
am: eb06e70e62
-s ours am: e1b6c20722
-s ours
...
am skip reason: Merged-In Ib0f0ce2a2733f878bb680d16fea15cfa794b7c1d with SHA-1 871071afbc
is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2105124
Change-Id: Iaaaf1f3e0775702850234f1127a63e50a75c6139
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 19:02:17 +00:00
Akilesh Kailash
425a0b3b8d
Revert "gs101: Enable system_dlkm dynamic partition" am: 7bb4293087
am: b66b02b5c5
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18513552
Change-Id: Idab7140b22eaa5bb4b8f4245b1e12a97df4f6184
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 19:00:50 +00:00