LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve conflicts for merge of commit '84f0d412' into master

Browse Source 
Conflicts:
	build/sdk.atree

Change-Id: I61b9fd47e8f1fde108eeceefa0ab2f16f9bf7096
This commit is contained in:
Trevor Johns
2014-10-17 12:54:56 -07:00
parent 4d265f3fa5 84f0d412b6
commit 775a2fe470
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
build/sdk.atree
View File

@@ -284,7 +284,12 @@ developers/build/prebuilts/gradle/NavigationDrawer sam
developers/build/prebuilts/gradle/ElevationBasic samples/${PLATFORM_NAME}/ui/views/Elevation/ElevationBasic
developers/build/prebuilts/gradle/ElevationDrag samples/${PLATFORM_NAME}/ui/views/Elevation/ElevationDrag
developers/build/prebuilts/gradle/ClippingBasic samples/${PLATFORM_NAME}/ui/views/Clipping/ClippingBasic
developers/build/prebuilts/gradle/JobScheduler samples/${PLATFORM_NAME}/ui/views/Clipping/JobScheduler
developers/build/prebuilts/gradle/JobScheduler samples/${PLATFORM_NAME}/ui/views/Clipping/ClippingBasic
developers/build/prebuilts/gradle/HdrViewfinder samples/${PLATFORM_NAME}/media/HdrViewfinder
developers/build/prebuilts/gradle/DocumentCentricApps samples/${PLATFORM_NAME}/ui/activitytasks/DocumentCentricApps
developers/build/prebuilts/gradle/DocumentCentricRelinquishIdentity samples/${PLATFORM_NAME}/ui/activitytasks/DocumentCentricRelinquishIdentity
developers/build/prebuilts/gradle/AppRestrictionEnforcer samples/${PLATFORM_NAME}/admin/AppRestrictionEnforcer
developers/build/prebuilts/gradle/AppRestrictionSchema samples/${PLATFORM_NAME}/admin/AppRestrictionSchema
developers/build/prebuilts/androidtv samples/${PLATFORM_NAME}/androidtv

2
samples/samples_source.prop_template
View File

@@ -1,4 +1,4 @@
Pkg.UserSrc=false
Pkg.Revision=3
Pkg.Revision=1
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}