summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2012-08-23am 47e0cef8: am 77b9074f: Backport from master.android-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_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_r1tools_r22.2kitkat-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-devidea133-weekly-releaseidea133Tsu Chiang Chuang
2012-08-23am 77b9074f: Backport from master.android-sdk-support_r11android-cts-4.2_r2tools_r22jb-mr1.1-dev-plus-aospjb-mr1.1-devjb-mr1-dev-plus-aospjb-mr1-devTsu Chiang Chuang
2012-08-22resolved conflicts for merge of 05f1ab8c to masterYing Wang
2012-08-21Backport from master.android-cts-4.1_r4android-cts-4.1_r2android-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1tools_r21jb-mr0-releasejb-devTsu Chiang Chuang
2012-08-21Build emma as a static Java library.android-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_r1jb-mr1.1-releasejb-mr1-releaseYing Wang
2012-08-06adding unbundled emma library.Tsu Chiang Chuang
2010-03-08Add an empty CleanSpec.mkandroid-sdk-tools_r7android-sdk-tools_r6android-sdk-tools_r12android-sdk-adt_r20android-sdk-adt_r16.0.1android-sdk-adt_r12android-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-sdk-2.3.4_r1android-sdk-2.2_r2android-sdk-2.2_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.1_r1android-cts-4.0_r1android-cts-4.0.3_r2android-cts-4.0.3_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-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-adt-0.9.9android-adt-0.9.8android-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_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_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_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_r1tools_r9tools_r8tools_r7tools_r20jb-releaseics-plus-aospics-mr1-releaseics-mr1ics-mr0-releaseics-mr0ics-factoryrom-2-releasegingerbread-releasegingerbread-mr4-releasegingerbreadfroyo-releasefroyo-plus-aospfroyoJean-Baptiste Queru
2010-02-05am 48ffea93: am cf69b0c7: reconcile main tree with open-source eclairThe Android Open Source Project
2010-02-05am cf69b0c7: 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_r2eclairThe Android Open Source Project
2010-02-02Merge "Add LCOV handling to Emma's ANT driver/jar"Horia Ciurdar
2010-01-29reconcile android-2.1_r1 snapshotThe Android Open Source Project
2010-01-20Change handling of the source file that Android's build can't pre-generate, s...Tim Baverstock
2010-01-18Add LCOV handling to Emma's ANT driver/jarTim Baverstock
2010-01-12android-2.1_r1 snapshotThe Android Open Source Project
2009-12-01am 53666320: Add basic LCOV format support to EMMA\'s report generation. In K...Tim Baverstock
2009-11-27Add basic LCOV format support to EMMA's report generation. In K&R Java(!)Tim Baverstock
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-09-10am dd848041: Merge change 24481 into eclairPiotr Gurgul
2009-09-10Merge change 24481 into eclairandroid-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-releaseAndroid (Google) Code Review
2009-09-09Convert emma license info file into text formatPiotr Gurgul
2009-09-09am 43519313: Make a library version of the custom emma library.Xavier Ducrohet
2009-09-09Make a library version of the custom emma library.Xavier Ducrohet
2009-09-04merge from open-source masterJean-Baptiste Queru
2009-09-03merge from donutdonut-plus-aospJean-Baptiste Queru
2009-08-18am 9285a86b: Change emma to be optional build target.Brett Chabot
2009-08-18am 758de404: Remove emma from test build to save space.Brett Chabot
2009-08-14Change emma to be optional build target.android-sdk-tools_r2android-sdk-1.6_r2android-sdk-1.6_r1android-sdk-1.6-docs_r1android-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_r1donut-release2donut-releasedonutBrett Chabot
2009-08-13Remove emma from test build to save space.Brett Chabot
2009-04-22Merge donut into masterJean-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-1.5_r3android-sdk-1.5_r1android-sdk-1.5-preandroid-1.5r4android-1.5r3android-1.5r2android-1.5cupcake-releasecupcakeThe Android Open Source Project
2009-03-03auto import from //depot/cupcake/@135843The Android Open Source Project
2009-01-15auto import from //branches/cupcake/...@126645The Android Open Source Project
2008-12-17Code drop from //branches/cupcake/...@124589The Android Open Source Project
2008-10-21Initial Contributionandroid-1.0release-1.0cdma-importThe Android Open Source Project
1970-01-12external/emma 2.0.5312upstream/2.0.5312Upstream