PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of a8af2d3664 to pi-dev-plus-aosp

Browse Source 
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ie95fe77f761197dee450e86bc0f7edba8d514959
Merged-In: I16b51d7feabc914219c24731eb39a23bd1782571
This commit is contained in:
Stanley Tng
2018-10-15 21:56:50 -07:00
parent dce00f9ae2 a8af2d3664
commit 0cc7d9a2af
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/development/featureflags/FeatureFlagPreference.java
View File

@@ -17,6 +17,8 @@
package com.android.settings.development.featureflags; package com.android.settings.development.featureflags;
import android.content.Context; import android.content.Context;
import android.util.Log;
import androidx.preference.SwitchPreference; import androidx.preference.SwitchPreference;
import android.util.FeatureFlagUtils; import android.util.FeatureFlagUtils;
import android.util.Log; import android.util.Log;