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>
This commit is contained in:
commit
05433d666e