[automerger skipped] Merge "battery: disable wireless for pts battery test" into tm-qpr-dev am: 0c3ba8595a
am: 3f1203c08d
-s ours
am skip reason: Merged-In I5bcf9baeb2818b439520167b518b2e5c5224d7e2 with SHA-1 5c01c78ce0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/20680159
Change-Id: Iafe897490b54bd803e41abb77469345793e00927
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
8a75e540e7