drgreen/android_device_google_gs-common
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,472 Commits 2 Branches 0 Tags
Commit Graph

1472 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xin Li
deea5f2205 Merge tm-dev-plus-aosp-without-vendor@8763363 
Bug: 236760014
Merged-In: I6844a141739f93154d10debc29c7565f92349d25
Change-Id: I9e50a9e46d764e98862bc1b9f4d127040a34cde4
 2022-06-27 23:37:33 +00:00
Darren Hsu
906297a518 [automerger skipped] powerstats: add new parameter to provide aoc clock am: 2756ac31ff am: cc5583141a am: a5a01d4cc7 -s ours 
am skip reason: Merged-In I047d7ae163941c2168dcd8a0ea34da73ab4a8477 with SHA-1 2756ac31ff is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/18966586

Change-Id: I4f48155af365a4ff348af9585544d85a14d90cdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 04:44:55 +00:00
Darren Hsu
0eb94f60e4 [automerger skipped] powerstats: add new parameter to provide aoc clock am: 2756ac31ff am: 46a9f0ac04 am: af4ed69699 -s ours 
am skip reason: Merged-In I047d7ae163941c2168dcd8a0ea34da73ab4a8477 with SHA-1 d4cab2b2a6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/18966586

Change-Id: Iee2487eeaf1d6b688c5ae4d4e29d3b4dbe24802c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 04:44:36 +00:00
Darren Hsu
a5a01d4cc7 powerstats: add new parameter to provide aoc clock am: 2756ac31ff am: cc5583141a 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/18966586

Change-Id: I1881f0fa848b47148ff23c624bf645bb943567fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 04:26:59 +00:00
Darren Hsu
af4ed69699 powerstats: add new parameter to provide aoc clock am: 2756ac31ff am: 46a9f0ac04 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/18966586

Change-Id: I54761bf9a3af8761fe680eea41077f8401fe9072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 04:26:44 +00:00
Darren Hsu
46a9f0ac04 powerstats: add new parameter to provide aoc clock am: 2756ac31ff 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/18966586

Change-Id: I5da4ca45fe040c37914a35141083782220adabcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 04:00:12 +00:00
Darren Hsu
cc5583141a powerstats: add new parameter to provide aoc clock am: 2756ac31ff 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/18966586

Change-Id: I88a668a92b324132d456209362bd065b788460f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 04:00:12 +00:00
Darren Hsu
2756ac31ff powerstats: add new parameter to provide aoc clock 
AoC power stats are reported in ticks that are different frequency
in different SoC.

Bug: 233923713
Test: dumpsys android.hardware.power.stats.IPowerStats/default
Change-Id: I047d7ae163941c2168dcd8a0ea34da73ab4a8477
Merged-In: I047d7ae163941c2168dcd8a0ea34da73ab4a8477
Signed-off-by: Darren Hsu <darrenhsu@google.com>
 2022-06-17 12:45:53 +00:00
Darren Hsu
d4cab2b2a6 powerstats: add new parameter to provide aoc clock 
AoC power stats are reported in ticks that are different frequency
in different SoC.

Bug: 233923713
Test: dumpsys android.hardware.power.stats.IPowerStats/default
Change-Id: I047d7ae163941c2168dcd8a0ea34da73ab4a8477
Signed-off-by: Darren Hsu <darrenhsu@google.com>
 2022-06-17 20:23:06 +08:00
Sam Dubey
7134f571dd Revert "Use libaoc to provide consistent timestamp calculations" am: 33552445b8 am: 116941d5cf am: 3605c7902c 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/18817091

Change-Id: I32ed3f091eb155e07a91b67a81f68841d37785ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 05:32:10 +00:00
Sam Dubey
32d992ae43 Revert "Use libaoc to provide consistent timestamp calculations" am: 33552445b8 am: 9570f914cf am: ca4f0cba4c 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/18817091

Change-Id: I28cee81c1fe0c65ed514caf2a86c378d737534ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 05:31:55 +00:00
Sam Dubey
3605c7902c Revert "Use libaoc to provide consistent timestamp calculations" am: 33552445b8 am: 116941d5cf 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/18817091

Change-Id: I50520e960eda489beb64c1ffdc22dde20384815c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 05:06:23 +00:00
Sam Dubey
ca4f0cba4c Revert "Use libaoc to provide consistent timestamp calculations" am: 33552445b8 am: 9570f914cf 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/18817091

Change-Id: I7003b28ffa06a7dba9c21086ca780f63f5f5f172
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 05:06:05 +00:00
Sam Dubey
9570f914cf Revert "Use libaoc to provide consistent timestamp calculations" am: 33552445b8 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/18817091

Change-Id: I6804f84f5155da711012620a4a7f2ff223eec11b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 04:50:48 +00:00
Sam Dubey
116941d5cf Revert "Use libaoc to provide consistent timestamp calculations" am: 33552445b8 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/18817091

Change-Id: I707cabef3056776f2de4348c01743c6e8d91d77c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 04:50:48 +00:00
Sam Dubey
33552445b8 Revert "Use libaoc to provide consistent timestamp calculations" 
Revert "Allow libaoc to be used in more contexts"

Revert submission 18605412-b-233923713

Reason for revert: Completely broke master-without-vendor

Bug: 235533674

Reverted Changes:
Iacd541815:Use libaoc to provide consistent timestamp calcula...
Id31ee3439:Allow libaoc to be used in more contexts

Change-Id: I3345d0e4baa8d5dce22be20f0213ad1421ce1a90
 2022-06-10 03:23:56 +00:00
Craig Dooley
0223ab9b65 Use libaoc to provide consistent timestamp calculations am: 9f4ac2c565 am: 1925d8a8d5 am: ebac96bd5d 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/18744881

Change-Id: Ieb6bdd77ea71432435b22d5994fe2452788effbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 23:52:44 +00:00
Craig Dooley
edca23210c Use libaoc to provide consistent timestamp calculations am: 9f4ac2c565 am: 8259bcf6fa am: e41d11496c 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/18744881

Change-Id: I1ad7405bcf880b97f463010fc9d19274e1dfa642
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 23:52:29 +00:00
Craig Dooley
ebac96bd5d Use libaoc to provide consistent timestamp calculations am: 9f4ac2c565 am: 1925d8a8d5 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/18744881

Change-Id: I1be4f39fed2997c4c5dbc2f22e7b530ab7545a97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 23:11:00 +00:00
Craig Dooley
e41d11496c Use libaoc to provide consistent timestamp calculations am: 9f4ac2c565 am: 8259bcf6fa 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/18744881

Change-Id: Id6116cff1523def86640e9846dcf1be54aa6c432
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 23:10:41 +00:00
Craig Dooley
1925d8a8d5 Use libaoc to provide consistent timestamp calculations am: 9f4ac2c565 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/18744881

Change-Id: I2738efe99e69d0911a30408e9e48a2ef09213301
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 22:47:16 +00:00
Craig Dooley
8259bcf6fa Use libaoc to provide consistent timestamp calculations am: 9f4ac2c565 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/18744881

Change-Id: I9caf2ea34473687feda3e39d5640241cc76b58e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 22:47:07 +00:00
Craig Dooley
9f4ac2c565 Use libaoc to provide consistent timestamp calculations 
Bug: 233923713
Change-Id: Iacd541815f40adef879e05d9bd8ded056e9a760d
 2022-06-04 05:11:46 +00:00
Darren Hsu
49110c5a63 powerstats: Introduce AoC timed data provider am: 391f601be6 am: cc57290bc2 am: ca73cc6467 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/18133407

Change-Id: I2090fde6d6b40b5c24ffd2c20d0726f680bbb35e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 00:53:06 +00:00
Darren Hsu
ca73cc6467 powerstats: Introduce AoC timed data provider am: 391f601be6 am: cc57290bc2 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/18133407

Change-Id: I199c2d8e7cc0429c0d373049591989a1a16e863f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 17:51:49 +00:00
Darren Hsu
c23ff08f38 powerstats: Introduce AoC timed data provider am: 391f601be6 am: 9a9d55e7a4 am: 24d1a71244 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/18133407

Change-Id: I47785a422a1731879c745b7ca10c064d02b9e2d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 14:38:26 +00:00
Darren Hsu
24d1a71244 powerstats: Introduce AoC timed data provider am: 391f601be6 am: 9a9d55e7a4 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/18133407

Change-Id: I90ffb4d5a82c08ad51f7b351dd2b311618ce47c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 14:04:42 +00:00
Darren Hsu
9a9d55e7a4 powerstats: Introduce AoC timed data provider am: 391f601be6 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/18133407

Change-Id: I917fcf8e180ccefffbb2d265e8fa24a2c8c6f126
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 13:31:55 +00:00
Darren Hsu
cc57290bc2 powerstats: Introduce AoC timed data provider am: 391f601be6 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/18133407

Change-Id: Ied87d80cb8d488684ad2401e7a11181365bd801a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 13:31:45 +00:00
Darren Hsu
391f601be6 powerstats: Introduce AoC timed data provider 
Reading data from an AoC sysfs node by getline takes 1 second. In total
there are 17 AoC sysfs nodes that must be read. The worst case is taking
17 seconds long that is greater than dumpsys timeout. Therefore, we need
the timeout mechanism to ignore the AoC power stats reporting when AoC
latency exceeds the allowed time.

Bug: 219630658
Test: dumpsys android.hardware.power.stats.IPowerStats/default
Change-Id: Ic5c2a0b36728153fd2e2593599a8f2bcdb50ace4
Signed-off-by: Darren Hsu <darrenhsu@google.com>
 2022-05-03 03:30:42 +00:00
Automerger Merge Worker
610c07d250 Merge "Revert "powerstats: timeout mechanism for AoC data provider" am: 20b039192d am: 3ecc24fc06" into tm-d1-dev-plus-aosp am: 0c0fef6b10 am: 2f5eb7406f 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/17935512

Change-Id: I47da6e9d47544ec346b3086ed71e485b0acd3136
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:30 +00:00
Kelly Rossmoyer
8ea420f0e0 Revert "powerstats: timeout mechanism for AoC data provider" am: 20b039192d am: 4cf26f2c2d am: 7a39e48a7b am: 2672089095 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/17935512

Change-Id: I61d942cd985fcee054305e45aec69c9215464de9
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:08 +00:00
Kelly Rossmoyer
18a77b904f Revert "powerstats: timeout mechanism for AoC data provider" am: 20b039192d am: 4cf26f2c2d am: 9cfc2829e8 am: c36288e364 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/17935512

Change-Id: I507a5edb89c96dab1ec65f8166599a37f29adcab
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:47 +00:00
Automerger Merge Worker
2f5eb7406f Merge "Revert "powerstats: timeout mechanism for AoC data provider" am: 20b039192d am: 3ecc24fc06" into tm-d1-dev-plus-aosp am: 0c0fef6b10 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/17935512

Change-Id: Icd770d4976f0f1864ea5e87d160b3247ebc2a6cb
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
2672089095 Revert "powerstats: timeout mechanism for AoC data provider" am: 20b039192d am: 4cf26f2c2d am: 7a39e48a7b 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/17935512

Change-Id: Ic56a4f488beeccbc51f8f94e1b0b5cbac1be76e9
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:31 +00:00
Kelly Rossmoyer
c36288e364 Revert "powerstats: timeout mechanism for AoC data provider" am: 20b039192d am: 4cf26f2c2d am: 9cfc2829e8 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/17935512

Change-Id: I0da2a2161254d566b1fd4de4abb578a61cdfb7e9
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:12 +00:00
Automerger Merge Worker
0c0fef6b10 Merge "Revert "powerstats: timeout mechanism for AoC data provider" am: 20b039192d am: 3ecc24fc06" into tm-d1-dev-plus-aosp 2022-04-25 04:42:02 +00:00
Kelly Rossmoyer
7a39e48a7b Revert "powerstats: timeout mechanism for AoC data provider" am: 20b039192d am: 4cf26f2c2d 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/17935512

Change-Id: I83777757e5c5fc8ae890f1afd88951f92c899675
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
e1f50e7b8c Revert "powerstats: timeout mechanism for AoC data provider" am: 20b039192d am: 3ecc24fc06 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/17935512

Change-Id: I6eb27b99f820f92b530f2a6bb8d88be136d22679
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
9cfc2829e8 Revert "powerstats: timeout mechanism for AoC data provider" am: 20b039192d am: 4cf26f2c2d 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/17935512

Change-Id: I6eea43ccf275eb8c37d08f74e62db61c217841ba
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
7c1bb2ca79 Revert "powerstats: timeout mechanism for AoC data provider" am: 20b039192d am: db5398e4da 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/17935512

Change-Id: I64bc42ce64f7925f6ccd8d8440a48a87b44f2d13
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:24 +00:00
Kelly Rossmoyer
4cf26f2c2d Revert "powerstats: timeout mechanism for AoC data provider" am: 20b039192d 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/17935512

Change-Id: I0136c81c6565650d3245a4ef9acc39af81235617
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:15 +00:00
Kelly Rossmoyer
db5398e4da Revert "powerstats: timeout mechanism for AoC data provider" am: 20b039192d 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/17935512

Change-Id: I007a15138c6544da71f64d27d5b4b48daf0f2c4c
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
3ecc24fc06 Revert "powerstats: timeout mechanism for AoC data provider" am: 20b039192d 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/17935512

Change-Id: I5d4ed81801f63aa6c0143ab8b78769aa1512bc3b
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
20b039192d 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: I6844a141739f93154d10debc29c7565f92349d25
 2022-04-24 23:22:49 +00:00
Darren Hsu
d68c4c2c1d powerstats: timeout mechanism for AoC data provider am: df08a31b76 am: db372c84a2 am: 83dbd42ded 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/17800080

Change-Id: I3c60e82aed54d8970b580cd0625070b32c1a5c09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 05:13:24 +00:00
Darren Hsu
83dbd42ded powerstats: timeout mechanism for AoC data provider am: df08a31b76 am: db372c84a2 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/17800080

Change-Id: I92f008416831a92d6ba35d218c719573500428dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 04:57:55 +00:00
Darren Hsu
ef1de32de7 powerstats: timeout mechanism for AoC data provider am: df08a31b76 am: f799b375bb 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/17800080

Change-Id: I25064c9bef0f6ef1fdfe1e4f3a678f073eef529c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 04:57:25 +00:00
Darren Hsu
db372c84a2 powerstats: timeout mechanism for AoC data provider am: df08a31b76 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/17800080

Change-Id: I4fb81f5673b918ce93991b020c3fa1d14bffc7b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 04:41:59 +00:00
Darren Hsu
f799b375bb powerstats: timeout mechanism for AoC data provider am: df08a31b76 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/17800080

Change-Id: If5a6edded63a93d6fe6270b92afafb76fe7f7c79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 04:40:55 +00:00