Chris Iremonger 8304427a16 resolve merge conflicts of 8969979 to master ...

Test: built and tested this with QA upsteam

Change-Id: Ica2c69ba13054bd6169bb531951e0a7556f20e0a

2016-10-11 20:33:43 -07:00

..

build_tools_runtime.properties

Add Build-Tools runtime.properties file.

2014-06-03 13:46:51 -07:00

build_tools_source.prop_template

Android 7.1.1 DP1 / SDK API 25.0.0

2016-10-06 17:14:58 -07:00

doc_source.prop_template

Final API 24 SDK for N.

2016-05-25 17:42:59 -07:00

plat_tools_source.prop_template

Android 7.1.1 DP1 / SDK API 25.0.0

2016-10-06 17:14:58 -07:00

platform_source.prop_template

resolve merge conflicts of 8969979 to master

2016-10-11 20:33:43 -07:00

sdk_files_NOTICE.txt

Add split-select tool to SDK build.

2014-11-05 11:34:03 -08:00

sdk.properties

Update skin list.

2011-07-18 11:44:36 -07:00

source_source.prop_template

Final API 24 SDK for N.

2016-05-25 17:42:59 -07:00

support_README.txt

Rename Compatibility into support and move it to rev 4. DO NOT MERGE.

2011-09-16 21:38:08 -07:00

support_source.prop_template

Bump support library version to 23.0.1 DO NOT MERGE

2015-08-27 20:51:10 +00:00

usbdriver_source.properties

Update revision of Android SDK USB driver for Windows

2014-09-15 10:52:19 -07:00