Hyunyoung Song e612775922 resolved conflicts for merge of 13ef17a3 to mnc-dr-dev ...

b/22609402
Change-Id: I140cf972d57e14737a6f91c0b4a8ec6c7ff1af2b

2015-07-22 11:31:04 -07:00

protos

resolved conflicts for merge of 13ef17a3 to mnc-dr-dev

2015-07-22 11:31:04 -07:00

res

resolved conflicts for merge of 13ef17a3 to mnc-dr-dev

2015-07-22 11:31:04 -07:00

src/com/android/launcher3

resolved conflicts for merge of 13ef17a3 to mnc-dr-dev

2015-07-22 11:31:04 -07:00

tests

resolved conflicts for merge of 13ef17a3 to mnc-dr-dev

2015-07-22 11:31:04 -07:00

util

resolved conflicts for merge of 13ef17a3 to mnc-dr-dev

2015-07-22 11:31:04 -07:00

WallpaperPicker

resolved conflicts for merge of 13ef17a3 to mnc-dr-dev

2015-07-22 11:31:04 -07:00

.gitignore

resolved conflicts for merge of 13ef17a3 to mnc-dr-dev

2015-07-22 11:31:04 -07:00

Android.mk

resolved conflicts for merge of 13ef17a3 to mnc-dr-dev

2015-07-22 11:31:04 -07:00

AndroidManifest.xml

resolved conflicts for merge of 13ef17a3 to mnc-dr-dev

2015-07-22 11:31:04 -07:00

CleanSpec.mk

Revert "Revert "Move wallpaper picker code to a separate directory""

2013-12-11 15:41:28 +01:00

fill_screens.py

Updating dialtacts to new package.

2012-08-21 13:35:10 -07:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

2009-03-03 19:32:27 -08:00

NOTICE

auto import from //depot/cupcake/@135843

2009-03-03 19:32:27 -08:00

print_db.py

Removing workspace screens on load and ensuring we don't bind on new apps until returning to Launcher.

2013-08-20 15:03:13 -07:00

proguard.flags

resolved conflicts for merge of 13ef17a3 to mnc-dr-dev

2015-07-22 11:31:04 -07:00

update_gallery_files.py

Update script to pull latest files from Gallery

2013-12-13 16:28:36 +01:00

update_system_wallpaper_cropper.py

Create separate project for Wallpaper Picker

2013-12-13 12:50:32 +01:00

S

Description

No description provided

658 MiB

Languages

Java 57.2%

Kotlin 42.4%

AIDL 0.3%