Ji-Hwan Lee ad42c9e905 Proper resolution of conflict for 8062092a ...

Bug: 15793651
Change-Id: Ib618a9eb179dae3e2284eb8cf19a2b9216345708

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

..

build_tools_runtime.properties

Add Build-Tools runtime.properties file.

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

build_tools_source.prop_template

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

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

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

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

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

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

usbdriver_source.properties

Proper resolution of conflict for 8062092a

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