OSDN Git Service

merge in klp-release history after reset to klp-dev
[android-x86/dalvik.git] / vm / ReconfigureDvm.mk
2013-06-14 Jean-Baptiste Queruam 840d233c: am 800e4320: am 63c34b5e: am 68719a17...
2013-04-25 Xavier Ducrohetam 60db431f: am 4b724cff: Fix dx to match the new SDK...
2013-04-25 Raphael Mollam 2f23f4cb: am c26c1291: Fix dx.bat to match the new...
2013-02-26 Jean-Baptiste Queruam e5310471: am d8232960: am 68719a17: Reconcile with...
2013-01-02 jwilsonam 8b135734: am cbac7aed: am 51997559: Fail if the...
2012-12-19 Ying Wangresolved conflicts for merge of e016e80c to jb-mr1...
2012-11-27 The Android Open... Merge jb-mr1-dev into aosp/master - do not merge
2012-11-12 Yohann Rousselam f118a9fc: am a3df5b58: am b6f4e037: am afe3a013...
2012-11-12 yrousselam 96cdc4ca: am ce0723cc: am 437f58a5: am 2d2f13c5...
2012-11-12 The Android Open... am d9de2f66: am bb077798: Reconcile with jb-mr1-release...
2012-11-12 The Android Open... am d5c3cb5f: am 890e41c1: Merge f870f2d - do not merge
2012-11-07 Yohann Rousselam 288f2280: Revert "Fix alignment when recompacting...
2012-11-07 yrousselam 707ebe9f: Fix alignment when recompacting a DexMerge...
2012-11-06 The Android Open... am 6fbc2f19: am e7e77c4b: Reconcile with jb-mr1-factory...
2012-10-31 The Android Open... Reconcile with jb-mr1-factory-release jb-mr1-release...
2012-10-29 jeffhaoam f6650edf: am d454d96b: am a0475a59: (-s ours) am...
2012-10-29 jeffhaoam 3daa7a27: am 07df9514: am 69dd411c: (-s ours) Add...
2012-10-17 jeffhaoam 13b52dd6: am a0475a59: am d5cc3680: (-s ours) am...
2012-10-17 jeffhaoam 9db54b1e: Add dx option to always generate const...
2012-10-17 Kenny Rootam 119d6541: resolved conflicts for merge of ab84215a...
2012-10-17 Kenny Rootresolved conflicts for merge of ab84215a to jb-mr1...
2012-10-17 Kenny RootMerge "Remove HAVE_SELINUX guards"
2012-10-17 Kenny RootRemove HAVE_SELINUX guards
2012-10-03 Jean-Baptiste QueruReconcile with jb-dev - do not merge
2012-09-21 Jean-Baptiste QueruReconcile jb-dev and AOSP
2012-09-12 The Android Open... Reconcile with jb-release - do not merge
2012-07-27 The Android Open... Reconcile with jb-release
2012-07-21 Elliott Hughesam 025a6d08: am b498bf42: Merge "[X86] X86 trace JIT...
2012-07-20 Elliott Hughesam b498bf42: Merge "[X86] X86 trace JIT compiler support"
2012-07-20 Elliott HughesMerge "[X86] X86 trace JIT compiler support"
2012-07-20 Dong-Yuan Chen[X86] X86 trace JIT compiler support
2012-07-19 The Android Open... Reconcile with jb-mr0-release
2012-07-19 Elliott Hughesam 51801371: Avoid sign extension in packed-switch.
2012-07-09 Jean-Baptiste QueruMerge from AOSP
2012-07-03 Elliott Hughesam 7798a614: Merge "Fix a possible off-by-one in the...
2012-06-21 Elliott Hughesam 8ca227ef: resolved conflicts for merge of 7c03fb79...
2012-06-21 Elliott Hughesresolved conflicts for merge of 7c03fb79 to jb-dev...
2012-06-21 Kenny RootMerge "Extend forkAndSpecialize to take additional...
2012-06-20 Jean-Baptiste Queruam 44292346: Merge "Switched code to blx <reg>"
2012-06-12 Elliott Hughesam effc95cb: Merge "Make dex merging stateless."
2012-06-12 Elliott Hughesam a9ac3a9d: Merge "Support debug info in dexmerge."
2012-06-11 Elliott Hughesam bf11122d: Merge "Revert " Trim after explicit gc.""
2012-06-05 Elliott Hughesam 53bc3719: Merge "Fixing a crash when doing lock...
2012-06-05 Elliott Hughesam 90d3e3b3: Merge "Add test cases for concurrent gc...
2012-05-30 Elliott Hughesam 07901d5e: Merge "Running rebuild.sh found a few...
2012-05-12 Elliott Hughesam 3492e8ab: Merge " Trim after explicit gc."
2012-05-11 Elliott Hughesam 07cfd74d: Merge " Fix: Issue 26627: Dalvik Heap...
2012-05-04 Elliott Hughesam 20aeca6e: Merge "Pad the 8 and 16 bit Jvalue members"
2012-05-04 Elliott Hughesresolved conflicts for merge of 93a44a28 to jb-dev...
2012-05-03 Elliott Hughesam e6bdc430: Merge "Fix a bug in dvmQuasiAtomicsShutdown."
2012-05-03 Elliott Hughesam a14639df: Merge "Support architectures that require...
2012-05-02 Elliott Hughesresolved conflicts for merge of 323d9152 to jb-dev...
2012-05-01 Elliott Hughesresolved conflicts for merge of 5a1fcc8a to jb-dev...
2012-05-01 Elliott Hughesresolved conflicts for merge of 4c5f9711 to jb-dev...
2012-05-01 Elliott Hughesam 8b946491: Merge "Fixed bug in x86-atom fast interpre...
2012-05-01 Elliott HughesMerge "Fixed bug in x86-atom fast interpreter. Adds...
2012-04-24 Elliott Hughesam 0cdf3934: am d2a4bb85: Merge "Fix a leak in the...
2012-04-24 Elliott Hughesresolved conflicts for merge of 156f3159 to master
2012-04-03 Mike LockwoodMerge remote-tracking branch 'goog/ics-aah'
2012-03-31 Elliott Hughesam 6353fe2f: am 2a3cc744: Merge "Set SYSTEM_PAGE_SIZE...
2012-03-28 Elliott Hughesam b9f5c7aa: am 3ddb30bd: am 6bcf5d20: Merge "Obvious...
2012-03-28 Elliott Hughesam 92ab8d50: am 531f7273: am 54ff31a5: Merge "Compact...
2012-02-13 Jean-Baptiste Queruam 67feae03: am 4cda226f: am c1052f9a: Merge "Add a...
2012-02-01 The Android Open... am 96ec3f6f: am af140189: Reconcile with ics-mr1-release
2012-02-01 Jean-Baptiste Queruam 81894b3a: am 2fe129bf: Merge "Updates to the VM...
2012-01-24 Stephen SmalleyExtend forkAndSpecialize to take additional inputs...
2012-01-23 The Android Open... am f9d0ce5f: Reconcile with ics-mr1-release
2012-01-23 jeffhaoam 7c9027e2: am 1c7e1e14: Fix to dex verifier to handle...
2012-01-20 The Android Open... am 31856263: Reconcile with ics-mr1-release
2012-01-20 Ben Chengam f9568520: am 232c385b: Bug fix for control-flow...
2012-01-18 Jean-Baptiste Queruam 9e8b05e4: am a669206d: Merge "cleanup redundant...
2012-01-17 Nick Kralevicham 516c0968: am 390d7c08: fix personality call.
2012-01-13 Selim Gurunam ca5d7a30: am 311886c6: Prevent memory fragmentation.
2012-01-13 Jean-Baptiste Queruam 6dea1575: Merge "fix dvmDbgOutputAllInterfaces to...
2011-12-09 The Android Open... am 2ca72c70: Reconcile with ics-mr1-release
2011-12-02 The Android Open... Reconcile with ics-mr1-release
2011-12-01 Ben Chengam a18e6d13: Initialize the vC field of inlined getters...
2011-12-01 Ben Chengam ee155d4f: Initialize the JNI indirect ref table...
2011-11-10 The Android Open... Reconcile with ics-mr1-release
2011-11-10 Andy McFaddenam cab0fdf8: (-s ours) DO NOT MERGE Further refinement...
2011-11-07 The Android Open... Reconcile with ics-mr1-release
2011-11-05 Elliott Hughesam 6cd72bd0: Merge "Don\'t pay for filename/line number...
2011-11-05 Elliott Hughesam 50e01501: Merge "Knock ::self() out of the ParseXml...
2011-11-05 Andy McFaddenam 4c83f214: Merge "Reduce Dalvik card table overhead...
2011-11-05 Andy McFaddenam ccf4c9d9: Don\'t decr profiling count without incr
2011-11-04 The Android Open... Reconcile with ics-mr1-release
2011-11-03 Andy McFaddenam ab97cd16: Start profiling after state prep
2011-11-03 Elliott Hughesam c4102d66: (-s ours) Merge "DO NOT MERGE: Optimize...
2011-11-03 Andy McFaddenam 63cd4b08: Don\'t malloc between fork and exec
2011-11-02 Andy McFaddenam 5269ef7b: am 3931f798: Fix cleanup (cherry-picked...
2011-11-02 Ben Chengam f51d43f0: am e3d9cde4: Disable JIT single-stepping...
2011-11-02 Andy McFaddenam a78b1255: Fix cleanup
2011-10-31 The Android Open... Reconcile with ics-mr1-release
2011-10-28 Ben Chengam f4948cc1: am b1e2271b: Fix single-stepping resume...
2011-10-28 Ben Chengam 8faec7e7: Fix single-stepping resume mode in the...
2011-10-28 Ed Heylkeep previous history after reset to mr1 plus aah chang...
2011-10-28 Ben ChengMerge "Fix single-stepping resume mode in the interpreter."
2011-10-26 Ed Heylundo reset to ics-mr1 until we have a better method
2011-10-26 Ed Heylreset to ics-mr1, but keep history
2011-10-25 The Android Automergermerge in ics-release history after reset to master
next