Raphael Moll 75d9cabc8e resolved conflicts for merge of fe2da416 to stage-aosp-master ...

Change-Id: I70924f6d51e2c790314a2f34ae7c33935a72bda6

2012-03-28 11:05:45 -07:00

..

prebuilt/v7/gridlayout

Add eclipse+readme files to prebuilt of v7-grid. do not merge.

2012-03-16 09:39:57 -07:00

api-versions.xml

Fix version metadata for java.lang.reflect.Field. do not merge.

2012-02-23 18:07:42 -08:00

doc_source.prop_template

Merge SDK support for source.properties templates.

2012-03-27 11:59:06 -07: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

Merge SDK support for source.properties templates.

2012-03-27 11:59:06 -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

Move api.xml from tools/ to platform-tools/

2012-01-27 11:59:10 -08:00

platform_source.prop_template

Merge SDK support for source.properties templates.

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

sdk.properties

Update skin list.

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

source_source.prop_template

Merge SDK support for source.properties templates.

2012-03-27 11:59:06 -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

am 8d2f79ba: Merge "SDK: generate repo using latest schemas when available."

2012-03-22 13:27:44 -07:00

usbdriver_source.properties

cherrypick 76bd108d from master. do not merge.

2011-11-03 15:42:39 -07:00