Miao Wang 050c66aa7d resolved conflicts for 3db22d4d to mnc-dr-dev-plus-aosp ...

Change-Id: I2baac9e5b218fba7ec7cc4df9b518b6b90a343d2

2015-10-13 18:02:44 -07:00

..

tools

am 7ad271e7: Merge "Update windows sdk to build non-recursively"

2015-09-09 18:19:05 +00:00

Android.mk

Pass in current android.jar to api-generator

2015-09-26 22:21:29 +00: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 3db22d4d to mnc-dr-dev-plus-aosp

2015-10-13 18:02:44 -07:00

sdk.atree

am 03ae930a: am 9e2e8392: Merge "Pick installed Jack & Jill for the sdk"

2015-09-15 07:46:21 +00:00

sdk.exclude.atree

auto import from //depot/cupcake/@135843

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