summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2014-10-09Merge "Add -no-integrated-as at local level."android-wear-5.0.0_r1android-l-preview_r2lollipop-wear-releasel-previewChih-Hung Hsieh
2014-10-09Add -no-integrated-as at local level.Chih-Hung Hsieh
2014-05-07Merge "Remove unused LOCAL_LDLIBS."android-cts-5.1_r2android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r3android-5.1.1_r2android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-releaselollipop-mr1-devlollipop-devlollipop-cts-releaseYing Wang
2014-05-07Remove unused LOCAL_LDLIBS.Ying Wang
2013-07-23remove include of utils/Log.handroid-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_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_r1kitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devidea133-weekly-releaseidea133Colin Cross
2012-09-06am 4a213147: am 274d0571: Merge "Added support for parsing XMF versions 1.00 ...android-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_r1tools_r22.2jb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devJean-Baptiste Queru
2012-09-06am 274d0571: Merge "Added support for parsing XMF versions 1.00 and 1.01 head...android-sdk-support_r11android-cts-4.2_r2android-cts-4.2_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_r22jb-mr1.1-releasejb-mr1.1-dev-plus-aospjb-mr1.1-devjb-mr1-releasejb-mr1-dev-plus-aospjb-mr1-devJean-Baptiste Queru
2012-09-06Merge "Added support for parsing XMF versions 1.00 and 1.01 headers"tools_r21Jean-Baptiste Queru
2012-09-06Added support for parsing XMF versions 1.00 and 1.01 headersAndreas Lillvik
2012-08-15am 0eb1fab7: am 09a0c670: Merge "There is fd leak in sonivox lib when try ope...Jean-Baptiste Queru
2012-08-15am 09a0c670: Merge "There is fd leak in sonivox lib when try open any media f...Jean-Baptiste Queru
2012-08-15Merge "There is fd leak in sonivox lib when try open any media file > 2GB (MI...Jean-Baptiste Queru
2012-08-14There is fd leak in sonivox lib when try open any media filegbhakteX
2012-08-10Split out LOCAL_ASFLAGSYing Wang
2012-05-15Remove obsolete ThirdPartyProject.prop file.Elliott Hughes
2011-12-16Fix crash when scanning corrupt midi file.android-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-devMarco Nelissen
2011-01-30am d868ec62: Reconcile gingerbread-plus-aosp and honeycombandroid-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-releaseThe Android Open Source Project
2011-01-30Reconcile gingerbread-plus-aosp and honeycombThe Android Open Source Project
2011-01-30Mass merge from gingerbread - do not mergeThe Android Open Source Project
2011-01-28am d029b237: Remove unused file.Dan Bornstein
2011-01-24am fbbe5ab5: am 42196fd1: am cdffe35c: merge from gingerbreadThe Android Open Source Project
2011-01-24am 7eaac433: am d2c550cd: am d029b237: Remove unused file.Dan Bornstein
2011-01-24am 42196fd1: am cdffe35c: merge from gingerbreadThe Android Open Source Project
2011-01-24am d2c550cd: am d029b237: Remove unused file.Dan Bornstein
2011-01-21am cdffe35c: merge from gingerbreadandroid-sdk-tools_r12android-sdk-adt_r12The Android Open Source Project
2011-01-21merge from gingerbreadThe Android Open Source Project
2011-01-21am bc636d8f: (-s ours) Remove unused file. DO NOT MERGE.Dan Bornstein
2011-01-21Remove unused file. DO NOT MERGE.Dan Bornstein
2011-01-21am d029b237: Remove unused file.Dan Bornstein
2011-01-21Remove unused file.android-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.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_r1gingerbread-releasegingerbread-mr4-releasegingerbreadDan Bornstein
2010-12-21Fix engine state reporting.Marco Nelissen
2010-10-19Add missing NOTICE files.David Deephanphongs
2010-07-16am 91f74c00: add meta-files about 3rd party projectsThe Android Open Source Project
2010-07-16add meta-files about 3rd party projectsandroid-2.3_r1android-2.3.2_r1android-2.3.1_r1The Android Open Source Project
2010-07-09merge from open-source masterThe Android Open Source Project
2010-06-25Fix missing NLandroid-sdk-tools_r7android-adt-0.9.9android-adt-0.9.8tools_r9tools_r8tools_r7froyo-plus-aospBruce Beare
2010-03-08Add an empty CleanSpec.mkandroid-sdk-tools_r6android-sdk-2.2_r2android-sdk-2.2_r1android-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-releaseJean-Baptiste Queru
2010-02-05am 546b62cd: am d57f7d5f: reconcile main tree with open-source eclairThe Android Open Source Project
2010-02-05am d57f7d5f: reconcile main tree with open-source eclairThe Android Open Source Project
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_r2The 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-11-15merge from open-source masterJean-Baptiste Queru
2009-11-15merge from open-source masterJean-Baptiste Queru
2009-11-15merge from eclairJean-Baptiste Queru
2009-11-12eclair snapshotJean-Baptiste Queru
2009-08-25Fix infinite loop issue with correctly formed, but useless iMelody files (bug...android-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-releaseDave Sparks
2009-08-24Sonivox whitespace cleanupDave Sparks
2009-07-26reconcile korg/master into goog/masterdonut-plus-aospJean-Baptiste Queru
2009-07-25Merge korg/donut into korg/masterJean-Baptiste Queru