Raphael Moll a7a51a397e resolved conflicts for merge of 9583d2ed to jb-mr2-dev ...

Change-Id: Ib6c5f18a2b6429ef8bbca577e8cabcab26dc6ca1

2013-03-22 13:05:32 -07:00

..

api-versions.xml

Update API text file.

2012-11-05 17:09:52 -08:00

build_tools_source.properties

SDK: Build/Platform-tools revision 17.

2013-03-22 11:18:05 -07:00

doc_source.prop_template

Move rev for 2 for API 17 and 12 for support. do not merge.

2013-02-12 09:27:51 -08:00

images_armeabi_source.prop_template

Merge SDK support for source.properties templates.

2012-03-27 11:59:06 -07:00

images_armeabi-v7a_source.prop_template

Move rev for 2 for API 17 and 12 for support. do not merge.

2013-02-12 09:27:51 -08:00

images_mips_source.prop_template

Add Mips support to SDK.

2012-05-15 15:23:52 -07:00

images_x86_source.prop_template

Merge SDK support for source.properties templates.

2012-03-27 11:59:06 -07:00

plat_tools_source.properties

SDK: Build/Platform-tools revision 17.

2013-03-22 11:18:05 -07:00

platform_source.prop_template

Move rev for 2 for API 17 and 12 for support. do not merge.

2013-02-12 09:27:51 -08:00

sdk.properties

Update skin list.

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

source_source.prop_template

Prepare for JB SDK rev 3

2012-08-29 16:36:54 -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.properties

Move rev for 2 for API 17 and 12 for support. do not merge.

2013-02-12 09:27:51 -08:00

usbdriver_source.properties

Windows USB Driver for generic + Q, rev 7.

2012-08-28 13:23:47 -07:00