summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2015-08-21am 1396cdeb: am 72353f83: resolved conflicts for merge of ab01c96b to lmp-mr1...android-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1marshmallow-releasemarshmallow-dr-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-releaseYohann Roussel
2015-08-21am 72353f83: resolved conflicts for merge of ab01c96b to lmp-mr1-devYohann Roussel
2015-08-21resolved conflicts for merge of ab01c96b to lmp-mr1-devYohann Roussel
2015-08-19Ensure deterministic multidex partitioningYohann Roussel
2015-06-03Add a libbase dependency for dexdump/dexlist.Narayan Kamath
2015-05-01Remove libdexdump_static.Narayan Kamath
2015-04-08am b8a003c7: am 010ac971: Merge "Bump dx version to 1.11" into lmp-mr1-devBenoit Lamarche
2015-04-08am 1d40d9ea: am 7b153a1d: Merge "Fix potential dex index overflow in dx" into...Benoit Lamarche
2015-04-08am 00d77c91: resolved conflicts for merge of 6be6ed44 to lmp-mr1-dev-plus-aospBenoit Lamarche
2015-04-08am 010ac971: Merge "Bump dx version to 1.11" into lmp-mr1-devBenoit Lamarche
2015-04-08am 7b153a1d: Merge "Fix potential dex index overflow in dx" into lmp-mr1-devBenoit Lamarche
2015-04-08resolved conflicts for merge of 6be6ed44 to lmp-mr1-dev-plus-aospBenoit Lamarche
2015-04-08Merge "Bump dx version to 1.11" into lmp-mr1-devandroid-5.1.1_r5android-5.1.1_r17android-5.1.1_r12Benoit Lamarche
2015-04-08Merge "Fix potential dex index overflow in dx" into lmp-mr1-devBenoit Lamarche
2015-04-08Merge "Support --num-threads with --multi-dex (take 2)" into lmp-mr1-devBenoit Lamarche
2015-04-07am a6bf3001: resolved conflicts for merge of ab1774c0 to lmp-mr1-dev-plus-aospBenoit Lamarche
2015-04-07resolved conflicts for merge of ab1774c0 to lmp-mr1-dev-plus-aospBenoit Lamarche
2015-04-07am 5ff9033e: am f052d52e: Merge "Command line option for disabling warnings" ...Benoit Lamarche
2015-04-07am ae1d7c49: am 90fcf359: Don\'t discard directory entries in jar files.Narayan Kamath
2015-04-07am f052d52e: Merge "Command line option for disabling warnings" into lmp-mr1-devBenoit Lamarche
2015-04-07am 90fcf359: Don\'t discard directory entries in jar files.Narayan Kamath
2015-04-07Merge "Do not keep the DexFile field in Main between runs" into lmp-mr1-devBenoit Lamarche
2015-04-07Merge "Command line option for disabling warnings" into lmp-mr1-devBenoit Lamarche
2015-04-07am 65c602a4: am 008da7d4: Descriptor references are direct referencesYohann Roussel
2015-04-07Bump dx version to 1.11Benoit Lamarche
2015-04-07Fix potential dex index overflow in dxPeter Jensen
2015-04-07Support --num-threads with --multi-dex (take 2)Peter Jensen
2015-04-07Don't discard directory entries in jar files.Narayan Kamath
2015-04-07Do not keep the DexFile field in Main between runsBenoit Lamarche
2015-04-07Command line option for disabling warningsCsaba Kozák
2015-04-07am 008da7d4: Descriptor references are direct referencesYohann Roussel
2015-04-07Descriptor references are direct referencesYohann Roussel
2015-04-07am 2d13966c: am cc367043: Merge "Descriptor references are direct references"Yohann Roussel
2015-04-07am cc367043: Merge "Descriptor references are direct references"Yohann Roussel
2015-04-07Merge "Descriptor references are direct references"android-wear-5.1.1_r1android-wear-5.1.0_r1Yohann Roussel
2015-04-03am 14d81e14: am 45e4d877: Allow to disable forced keep of annotatedYohann Roussel
2015-04-03am 45e4d877: Allow to disable forced keep of annotatedYohann Roussel
2015-03-27am 931b89b5: Merge "Fix potential dex index overflow in dx"Benoit Lamarche
2015-03-27Merge "Fix potential dex index overflow in dx"Benoit Lamarche
2015-03-27Fix potential dex index overflow in dxPeter Jensen
2015-03-22Allow to disable forced keep of annotatedYohann Roussel
2015-03-22am 72a4be69: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT ME...Qiwen Zhao
2015-03-20reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.Qiwen Zhao
2015-03-20reset to 8205cac with history.Qiwen Zhao
2015-03-20am 0661627c: am 51deeeae: Merge "Remove references to the simulator."Elliott Hughes
2015-03-20am a1e7a2bb: am c4168d85: Merge "Update ziparchive usage to the new API."Piotr Jastrzebski
2015-03-20am 714f5c53: am 870b4f2d: Dalvik is dead, long live Dalvik!Brian Carlstrom
2015-03-20am b19ed0d9: am fb5b0d5b: Merge "Do not align 64-bit registers during instruc...mikaelpeltier
2015-03-20am 2cd296ba: am 76e15e36: Do not align 64-bit registers during instruction ex...mikaelpeltier
2015-03-20am c497f502: am 878445a7: Merge "Do not generate empty dex in multidex." into...Yohann Roussel