Tony Mantler 013441f296 resolved conflicts for merge of fab9a1f2 to mnc-dr-dev-plus-aosp ...

Change-Id: I5cd69798c3880b835cdebf45dcaf90a8b26a1d4d

2015-08-28 15:56:49 -07:00

..

tools

am 283439c7: am d592f8c7: Merge "Remove the mingw package check"

2015-08-13 21:46:32 +00:00

Android.mk

Add preference and recommendation libs to SDK build

2015-08-28 13:29:54 -07:00

build_android_stubs.mk

[DO NOT MERGE] Compile using Jack

2015-05-19 18:17:05 +02:00

optional.json

Optional library listing file.

2015-04-24 13:17:36 -07:00

product_sdk.mk

Remove unnecessary clang from product_sdk.mk.

2015-06-25 14:37:59 -07:00

sdk-android-arm64-v8a.atree

Use arm64 kernel-qemu in sdk-android-arm64-v8a.atree.

2014-08-19 09:33:45 -07:00

sdk-android-armeabi-v7a.atree

Move SDK system-image source.prop_templates in their own folder. DO NOT MERGE.

2014-06-20 08:49:37 -07:00

sdk-android-armeabi.atree

Move SDK system-image source.prop_templates in their own folder. DO NOT MERGE.

2014-06-20 08:49:37 -07:00

sdk-android-mips64.atree

Ability to generate SDK system-images for mips64

2015-05-01 16:50:27 +00:00

sdk-android-mips.atree

Move SDK system-image source.prop_templates in their own folder. DO NOT MERGE.

2014-06-20 08:49:37 -07:00

sdk-android-x86_64.atree

Move SDK system-image source.prop_templates in their own folder.

2014-06-14 21:31:13 -07:00

sdk-android-x86.atree

Move SDK system-image source.prop_templates in their own folder. DO NOT MERGE.

2014-06-20 08:49:37 -07:00

sdk-darwin-x86.atree

resolved conflicts for merge of 0f32d65d to mnc-dr-dev-plus-aosp

2015-08-03 11:36:50 -07:00

sdk-linux-x86.atree

resolved conflicts for merge of 0f32d65d to mnc-dr-dev-plus-aosp

2015-08-03 11:36:50 -07:00

sdk-windows-x86.atree

resolved conflicts for merge of 0f32d65d to mnc-dr-dev-plus-aosp

2015-08-03 11:36:50 -07:00

sdk.atree

Add preference and recommendation libs to SDK build

2015-08-28 13:29:54 -07:00

sdk.exclude.atree

auto import from //depot/cupcake/@135843

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

windows_sdk_whitelist.mk

Merge "Allow libbase to be used on Windows."

2015-03-30 17:47:20 +00:00