[automerger skipped] Merge "Fix import of anyLong in BatteryChartPreferenceControllerTest." into tm-qpr-dev am: 5ab0a976de
-s ours
am skip reason: Merged-In I52547d10f0579fddb21091b641925910db17ef38 with SHA-1 91aec69fdc
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19603838
Change-Id: Id7f285b8394b5d8d24b94ed4ab7d47c8d8f1b5ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: