Xavier Ducrohet bf3db3de59 resolved conflicts for merge of c32cb704 to master ...

Change-Id: Ib1c6dba900a25a52a28f09de0848fba55c873117

2014-05-22 11:25:39 -07:00

..

api-versions.xml

Update api-versions.xml for latest API changes

2013-11-20 14:41:01 -08: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

images_arm64-v8a_source.prop_template

Ability to generate SDK system-images for arm64 and x86_64

2014-05-19 10:25:09 -07:00

images_armeabi_source.prop_template

am f8a99a45: Reset version number to .0.0 for new API level SDK.

2014-05-22 16:46:31 +00:00

images_armeabi-v7a_source.prop_template

am f8a99a45: Reset version number to .0.0 for new API level SDK.

2014-05-22 16:46:31 +00:00

images_mips_source.prop_template

SDK: support generating repository XML with latest XSD.

2014-05-15 17:49:02 -07:00

images_x86_64_source.prop_template

Ability to generate SDK system-images for arm64 and x86_64

2014-05-19 10:25:09 -07:00

images_x86_source.prop_template

am f8a99a45: Reset version number to .0.0 for new API level SDK.

2014-05-22 16:46:31 +00: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

SDK: support generating repository XML with latest XSD.

2014-05-15 17:49:02 -07:00