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

Resolved conflicts for merge of '9875ec66' into lmp-dev

Browse Source 
Conflicts:
	build/sdk.atree

Change-Id: Ie195fc75425ccb4ad36e3267627ae66619380505
This commit is contained in:
Trevor Johns
2014-10-15 21:16:16 -07:00
parent 569e9febc5 9875ec66e1
commit d991bed6f1
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/sdk.atree
View File

@@ -274,6 +274,8 @@ developers/build/prebuilts/gradle/SwipeRefreshLayoutBasic sam
developers/build/prebuilts/gradle/SwipeRefreshListFragment samples/${PLATFORM_NAME}/ui/SwipeRefreshListFragment developers/build/prebuilts/gradle/SwipeRefreshListFragment samples/${PLATFORM_NAME}/ui/SwipeRefreshListFragment
developers/build/prebuilts/gradle/SwipeRefreshMultipleViews samples/${PLATFORM_NAME}/ui/SwipeRefreshMultipleViews developers/build/prebuilts/gradle/SwipeRefreshMultipleViews samples/${PLATFORM_NAME}/ui/SwipeRefreshMultipleViews
developers/build/prebuilts/gradle/MediaRouter samples/${PLATFORM_NAME}/media/MediaRouter developers/build/prebuilts/gradle/MediaRouter samples/${PLATFORM_NAME}/media/MediaRouter
developers/build/prebuilts/gradle/BluetoothChat samples/${PLATFORM_NAME}/connectivity/bluetooth/BluetoothChat
developers/build/prebuilts/gradle/MediaEffects samples/${PLATFORM_NAME}/media/MediaEffect
developers/build/prebuilts/gradle/BasicManagedProfile samples/${PLATFORM_NAME}/admin/BasicManagedProfile developers/build/prebuilts/gradle/BasicManagedProfile samples/${PLATFORM_NAME}/admin/BasicManagedProfile
developers/build/prebuilts/gradle/Camera2Basic samples/${PLATFORM_NAME}/media/Camera2Basic developers/build/prebuilts/gradle/Camera2Basic samples/${PLATFORM_NAME}/media/Camera2Basic
developers/build/prebuilts/gradle/Camera2Video samples/${PLATFORM_NAME}/media/Camera2Video developers/build/prebuilts/gradle/Camera2Video samples/${PLATFORM_NAME}/media/Camera2Video