summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2013-11-07Merge "/system/bin/sh _is_ the shell now, and ash is gone."HEADmastermainl-previewidea133-weekly-releaseidea133Elliott Hughes
2013-11-05/system/bin/sh _is_ the shell now, and ash is gone.Elliott Hughes
2012-08-30Merge "Fix $(INSTALLED_ANDROID_IMAGE_DATA_TARGET) dependency"android-sdk-support_r11android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-cts-4.2_r2android-cts-4.2_r1android-4.4w_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1android-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1android-4.2_r1android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1tools_r22.2tools_r22tools_r21kitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devjb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devjb-mr1.1-releasejb-mr1.1-dev-plus-aospjb-mr1.1-devjb-mr1-releasejb-mr1-dev-plus-aospjb-mr1-devJean-Baptiste Queru
2012-08-30Fix $(INSTALLED_ANDROID_IMAGE_DATA_TARGET) dependencyH.J. Lu
2012-08-16Merge "host modules don't need LOCAL_MODULE_TAGS"Joe Onorato
2012-06-13host modules don't need LOCAL_MODULE_TAGSJoe Onorato
2012-04-10vbox_x86 builds: force-set the vdi UUIDsandroid-cts-4.1_r4android-cts-4.1_r2android-cts-4.1_r1android-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1android-4.1.1_r6.1android-4.1.1_r6android-4.1.1_r5android-4.1.1_r4android-4.1.1_r3android-4.1.1_r2android-4.1.1_r1.1android-4.1.1_r1jb-releasejb-mr0-releasejb-devIliyan Malchev
2012-04-10vbox_x86: use cache.imgIliyan Malchev
2012-04-05vbox_x86: have separate system and data disksIliyan Malchev
2012-04-05editdisklbl: remove stale include-file referenceIliyan Malchev
2012-01-08Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block
2012-01-05Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block
2012-01-04Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGESteve Block
2011-07-11Remove the simulator target from all makefiles.android-sdk-adt_r20android-sdk-adt_r16.0.1android-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.0_r1android-cts-4.0.3_r2android-cts-4.0.3_r1android-4.0.4_r2.1android-4.0.4_r2android-4.0.4_r1.2android-4.0.4_r1.1android-4.0.4_r1android-4.0.3_r1.1android-4.0.3_r1android-4.0.2_r1android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1tools_r20ics-plus-aospics-mr1-releaseics-mr1ics-mr0-releaseics-mr0ics-factoryrom-2-releaseJeff Brown
2011-03-04Merge "vbox: add a ready-to-boot android_disk_vdi target"android-sdk-tools_r12android-sdk-adt_r12David Turner
2011-03-04vbox: add a ready-to-boot android_disk_vdi targetBruce Beare
2010-12-29Merge "Add ext4 support"Jean-Baptiste Queru
2010-12-29Add ext4 supportBruce Beare
2010-12-29Merge "Add ueventd service for diskinstaller init.rc"Jean-Baptiste Queru
2010-12-29Add ueventd service for diskinstaller init.rcBruce Beare
2010-12-29Merge "Add missing LOCAL_MODULE_TAGS defn"Jean-Baptiste Queru
2010-12-27Add missing LOCAL_MODULE_TAGS defnBruce Beare
2010-12-15am 91f6fb6c: Merge "Make the /system/bin/sh link so installer.c works."Jean-Baptiste Queru
2010-12-15Merge "Make the /system/bin/sh link so installer.c works."tools_r9tools_r8froyo-plus-aospJean-Baptiste Queru
2010-10-11Make the /system/bin/sh link so installer.c works.Bruce Beare
2010-07-09merge from open-source masterThe Android Open Source Project
2010-07-09diskconfig library has changed location. Fix include pathsandroid-sdk-tools_r7android-adt-0.9.9android-adt-0.9.8tools_r7Bruce Beare
2010-07-07merge from open-source masterThe Android Open Source Project
2010-07-02Delete the libdiskconfig sub directoryBruce Beare
2010-07-02Change systembuilder tag to optionalBruce Beare
2010-05-10merge from open-source masterandroid-sdk-2.3.4_r1android-cts-2.3_r5android-cts-2.3_r4android-cts-2.3_r3android-cts-2.3_r2android-cts-2.3_r12android-cts-2.3_r11android-cts-2.3_r10android-cts-2.3_r1android-2.3_r1android-2.3.7_r1android-2.3.6_r1android-2.3.6_r0.9android-2.3.5_r1android-2.3.4_r1android-2.3.4_r0.9android-2.3.3_r1aandroid-2.3.3_r1.1android-2.3.3_r1android-2.3.2_r1android-2.3.1_r1gingerbread-releasegingerbread-mr4-releasegingerbreadThe Android Open Source Project
2010-05-07Merge "Target to generate VirtualBox image"Jean-Baptiste Queru
2010-05-07Target to generate VirtualBox imageBruce Beare
2010-03-26Enable verbose optionBruce Beare
2010-03-08Add an empty CleanSpec.mkandroid-sdk-tools_r6android-sdk-2.2_r2android-sdk-2.2_r1android-cts-2.2_r8android-cts-2.2_r7android-cts-2.2_r6android-cts-2.2_r5android-cts-2.2_r4android-cts-2.2_r3android-cts-2.2_r2android-cts-2.2_r1android-2.2_r1.3android-2.2_r1.2android-2.2_r1.1android-2.2_r1android-2.2.3_r2.1android-2.2.3_r2android-2.2.3_r1android-2.2.2_r1android-2.2.1_r2android-2.2.1_r1froyo-releasefroyoJean-Baptiste Queru
2010-02-05reconcile main tree with open-source eclairandroid-sdk-tools_r5android-cts-2.1_r5android-cts-2.1_r4android-cts-2.1_r3android-cts-2.1_r2eclairThe Android Open Source Project
2010-01-29reconcile android-2.1_r1 snapshotThe Android Open Source Project
2010-01-12android-2.1_r1 snapshotThe Android Open Source Project
2009-04-22Merge donut into masterandroid-sdk-tools_r4android-sdk-tools_r3android-sdk-2.1_r1android-sdk-2.0_r1android-sdk-2.0.1_r1android-sdk-2.0.1-docs_r1android-2.1_r2.1sandroid-2.1_r2.1p2android-2.1_r2.1pandroid-2.1_r2android-2.1_r1android-2.0_r1android-2.0.1_r1eclair-sholes-release2eclair-sholes-releaseeclair-releaseeclair-passion-releasedonut-plus-aospJean-Baptiste Queru
2009-03-29Merge branch 'open_source_no_contributions' into google_internalThe Android Open Source Project
2009-03-18Merge commit 'remotes/korg/cupcake' into cupcake_to_masterJean-Baptiste Queru
2009-03-03auto import from //depot/cupcake/@135843android-sdk-tools_r2android-sdk-1.6_r2android-sdk-1.6_r1android-sdk-1.6-docs_r1android-sdk-1.5_r3android-sdk-1.5_r1android-sdk-1.5-preandroid-1.6_r2android-1.6_r1.5android-1.6_r1.4android-1.6_r1.3android-1.6_r1.2android-1.6_r1.1android-1.6_r1android-1.5r4android-1.5r3android-1.5r2android-1.5donut-release2donut-releasedonutcupcake-releasecupcakeThe Android Open Source Project
2009-03-03auto import from //depot/cupcake/@135843The Android Open Source Project
2009-02-10auto import from //branches/cupcake/...@130745The Android Open Source Project
2008-12-17Code drop from //branches/cupcake/...@124589The Android Open Source Project