am 52077b7a: Merge "Don\'t let old Launcher activity interfere with new one"...
Adam Cohen authored
am 52077b7a: Merge "Don\'t let old Launcher activity interfere with new one" into ub-now-porkchop am: 91c11b28 am: 7e88e90a am: b75de587 am: 29a81daa
am: d077b9d1

* commit 'd077b9d1':
9a4f2f42
Name Last commit Last update
WallpaperPicker Updating theme to use the light theme by default, instead of wallpaper theme
protos am a547c451: Revert "Add proto flag "javanano_use_deprecated_package" to avoid build breakage"
res Merge "Override the overscroll color for the widget rows." into ub-launcher3-burnaby
src/com/android/launcher3 Merge "Removing items which are on invalid screen" into ub-launcher3-burnaby
tests resolved conflicts for merge of 13ef17a3 to mnc-dr-dev
util resolved conflicts for merge of 13ef17a3 to mnc-dr-dev
.gitignore Adding gradle script for Android Studio
Android.mk Merge remote-tracking branch 'origin/ub-launcher3-burnaby' into mnc-dev
AndroidManifest.xml Updating the target sdk to launcher
CleanSpec.mk Revert "Revert "Move wallpaper picker code to a separate directory""
MODULE_LICENSE_APACHE2 auto import from //depot/cupcake/@135843
NOTICE auto import from //depot/cupcake/@135843
build.gradle Adding gradle script for Android Studio
fill_screens.py Updating dialtacts to new package.
print_db.py Removing workspace screens on load and ensuring we don't bind on new apps until returning to Launcher.
proguard.flags Merge remote-tracking branch 'origin/ub-launcher3-burnaby' into mnc-dev
update_gallery_files.py Update script to pull latest files from Gallery
update_system_wallpaper_cropper.py Create separate project for Wallpaper Picker