Zaiyue Xue 2e7957727f Fix import of anyLong in BatteryChartPreferenceControllerTest. ...

This is to fix the merge conflicts within tm-qpr-dev,
tm-qpr-dev-plus-aosp and master.

Bug: 236101166
Test: manual
Change-Id: I2f4531ccc7c59b279d14bc5c0bd6c1fe51dd475d
Merged-In: I52547d10f0579fddb21091b641925910db17ef38

2022-08-12 13:57:53 +08:00

..

anomaly-tester

…

componenttests

[Settings] Remove MobileNetworkActivity

2021-12-16 13:30:25 +08:00

legacy_unit

Update settings PrimarySwitchPreference reference

2021-09-02 13:10:19 +08:00

perftests

…

robotests

Fix import of anyLong in BatteryChartPreferenceControllerTest.

2022-08-12 13:57:53 +08:00

uitests

Move vibrate for calls setting to "Vibration & haptics" screen

2021-12-06 17:23:56 +00:00

unit

Distinguish multiple PendingIntents via requestCode

2022-07-18 11:18:28 +00:00