Raphael Moll 495f0c27a5 resolved conflicts for merge of cf390116 to jb-dev-plus-aosp ...

Change-Id: Ia215d78fbeefc59ccd1868fe1365f4260b561e24

2012-05-15 20:24:51 -07:00

..

tools

Support for Windows SDK pre-requisite module list.

2012-04-23 13:16:16 -07:00

Android.mk

SDK: don't generate empty codename line in source.properties. DO NOT MERGE.

2012-05-15 17:37:44 -07:00

product_sdk.mk

SDK: Update sdk product library dependency list

2012-04-24 17:01:20 -07:00

sdk_only_whitelist.mk

Move emulator GLES from development.git to sdk.git

2012-04-18 06:26:17 -07:00

sdk-android-armeabi-v7a.atree

Reference kernels in new location

2012-01-09 12:09:01 -08:00

sdk-android-armeabi.atree

Reference kernels in new location

2012-01-09 12:09:01 -08:00

sdk-android-x86.atree

Reference kernels in new location

2012-01-09 12:09:01 -08:00

sdk-darwin-x86.atree

Move stuff from prebuilt to prebuilts/tools

2012-04-03 16:33:35 -07:00

sdk-linux-x86.atree

Move stuff from prebuilt to prebuilts/tools

2012-04-03 16:33:35 -07:00

sdk-windows-x86.atree

Move stuff from prebuilt to prebuilts/tools

2012-04-03 16:33:35 -07:00

sdk.atree

Fix skin.

2012-05-07 18:14:36 -07:00

sdk.exclude.atree

auto import from //depot/cupcake/@135843

2009-03-03 19:29:09 -08:00