Merge \\"Changing the WallpaperSuggestionActivity to redirect to the actual wallpaper picker component defined in the config.\\" into nyc-mr1-dev am: fef6234ebc

am: 4dae8c2769

Change-Id: Ifa4e98aeea2d7a4ecf641aee003892fa76d15d83
This commit is contained in:
Sunny Goyal
2016-06-14 17:06:14 +00:00
committed by android-build-merger
4 changed files with 43 additions and 11 deletions

View File

@@ -32,9 +32,9 @@ import com.android.ims.ImsManager;
import com.android.settings.Settings.FingerprintEnrollSuggestionActivity;
import com.android.settings.Settings.FingerprintSuggestionActivity;
import com.android.settings.Settings.ScreenLockSuggestionActivity;
import com.android.settings.Settings.WallpaperSuggestionActivity;
import com.android.settings.Settings.WifiCallingSuggestionActivity;
import com.android.settings.Settings.ZenModeAutomationSuggestionActivity;
import com.android.settings.WallpaperSuggestionActivity;
import com.android.settingslib.drawer.Tile;
import java.util.Collection;