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

Change-Id: I70924f6d51e2c790314a2f34ae7c33935a72bda6

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

..

tools

Merge SDK support for source.properties templates.

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

Android.mk

Merge SDK support for source.properties templates.

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

sdk_only_whitelist.mk

Merge "Projects whitelisted for Windows SDK compilation."

2012-02-14 11:11:06 -08: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

SDK packaging for unified llvm-rs-cc binary.

2011-09-08 16:42:12 -07:00

sdk-linux-x86.atree

SDK packaging for unified llvm-rs-cc binary.

2011-09-08 16:42:12 -07:00

sdk-windows-x86.atree

Merge "SDK: package fastboot in platform-tools on 3 OSes." Do not merge.

2011-12-12 22:08:12 -08:00

sdk.atree

resolved conflicts for merge of fe2da416 to stage-aosp-master

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

sdk.exclude.atree

auto import from //depot/cupcake/@135843

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