Deepanshu Gupta 62012f9502 resolved conflicts for merge of f5dcf2f1 to master ...

Change-Id: Ia2dc136400e5e67df148d2f4b196d9d458b18ef6

2014-07-18 15:19:42 -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

RC version for build-tools.

2014-06-16 18:16:40 -07:00

doc_source.prop_template

Reset version number to .0.0 for new API level SDK.

2014-05-22 09:27:02 -07:00

plat_tools_source.prop_template

Reset version number to .0.0 for new API level SDK.

2014-05-22 09:27:02 -07:00

platform_source.prop_template

Update platform SDK component to revision 4.

2014-07-09 17:49:04 -07:00

sdk_files_NOTICE.txt

Fix SDK build.

2014-05-20 14:10:47 -07:00

sdk.properties

Update skin list.

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

source_source.prop_template

Reset version number to .0.0 for new API level SDK.

2014-05-22 09:27:02 -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

RC version for build-tools.

2014-06-16 18:16:40 -07:00

usbdriver_source.properties

Proper resolution of conflict for 8062092a

2014-06-23 15:40:08 +09:00