Stanley Tng a8af2d3664 resolve merge conflicts of 019a771d2d to stage-aosp-master ...

Test: I solemnly swear I tested this conflict resolution.
Bug: None

Change-Id: I2fc36f4ee9a600e7e9c5ce00708736a4d4548358

2018-10-15 17:30:02 -07:00

..

gateway

DO NOT MERGE Import clean up.

2018-09-04 13:54:46 -07:00

instrumentation

Migrate to use instrumentation classes from settingslib.

2018-01-24 12:30:39 -08:00

BasePreferenceController.java

DO NOT MERGE Import clean up.

2018-09-04 13:54:46 -07:00

FeatureFlags.java

Add Feature Flag for Hearing Aid Profile

2018-10-13 16:21:15 -07:00

InstrumentedActivity.java

Migrate to use instrumentation classes from settingslib.

2018-01-24 12:30:39 -08:00

InstrumentedFragment.java

Migrate to use instrumentation classes from settingslib.

2018-01-24 12:30:39 -08:00

InstrumentedPreferenceFragment.java

DO NOT MERGE Import clean up.

2018-09-04 13:54:46 -07:00

PreferenceControllerListHelper.java

Add preference controller to launch app-time-spent UI.

2018-03-23 14:13:57 -07:00

PreferenceControllerMixin.java

Add SettingsPrefController for Slices

2017-11-27 16:35:42 -08:00

PreferenceXmlParserUtils.java

DO NOT MERGE Import clean up.

2018-09-04 13:54:46 -07:00

SliderPreferenceController.java

DO NOT MERGE Import clean up.

2018-09-04 13:54:46 -07:00

SubSettingLauncher.java

DO NOT MERGE Import clean up.

2018-09-04 13:54:46 -07:00

TogglePreferenceController.java

DO NOT MERGE Import clean up.

2018-09-04 13:54:46 -07:00