Merge "Revert "powerstats: set time limit as timeout for AoC" am: 9247e99d14
am: 2f145d4c2e
" into tm-d1-dev-plus-aosp am: 4488b01cd2
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17935514 Change-Id: Ibbdb42359fe50bd1e41f9991b24604a29ba69d7b 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
3be770e315