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>
This commit is contained in:
commit
610c07d250