summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am ec5683a4: am a7e8919e: am 2e250c82: Revert "Always enable lock level checks."Brian Carlstrom2013-08-141-1/+1
|\
| * am a7e8919e: am 2e250c82: Revert "Always enable lock level checks."Brian Carlstrom2013-08-141-1/+1
| |\
| | * am 2e250c82: Revert "Always enable lock level checks."Brian Carlstrom2013-08-141-1/+1
| | |\
| | | * Revert "Always enable lock level checks."Brian Carlstrom2013-08-141-1/+1
* | | | Merge "Add -XX:+DisableExplicitGC option for Art" into dalvik-devAnwar Ghuloum2013-08-144-1/+16
|\ \ \ \
| * | | | Add -XX:+DisableExplicitGC option for ArtAnwar Ghuloum2013-08-144-1/+16
* | | | | am ca06c307: (-s ours) am 5b2eece6: (-s ours) Reconcile with klp-release - do...The Android Open Source Project2013-08-140-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 5b2eece6: (-s ours) Reconcile with klp-release - do not mergeThe Android Open Source Project2013-08-140-0/+0
| |\ \ \ \ | | | |/ / | | |/| / | | |_|/ | |/| |
| | * | Reconcile with klp-release - do not mergeThe Android Open Source Project2013-08-140-0/+0
| | |\ \ | |/ / /
| | * | merge in klp-release history after reset to klp-devThe Android Automerger2013-08-140-0/+0
| | |\ \ | |/ / /
| | * | merge in klp-release history after reset to klp-devThe Android Automerger2013-08-130-0/+0
| | |\ \
| | | * \ merge in klp-release history after reset to klp-devThe Android Automerger2013-08-120-0/+0
| | | |\ \
| | | | * \ merge in klp-release history after reset to masterThe Android Automerger2013-08-060-0/+0
| | | | |\ \
| | | | | * \ merge in klp-release history after reset to masterThe Android Automerger2013-08-050-0/+0
| | | | | |\ \
| | | | | | * | Merge remote-tracking branch 'goog/dalvik-dev' into merge-art-to-dalvik-devBrian Carlstrom2013-07-31174-3443/+4556
* | | | | | | | Revert "Update ART for LLVM merge up to r187914."Brian Carlstrom2013-08-142-2/+4
|/ / / / / / /
* | | | | | | Update ART for LLVM merge up to r187914.Stephen Hines2013-08-132-4/+2
* | | | | | | Merge remote-tracking branch 'goog/dalvik-dev' into merge-artBrian Carlstrom2013-08-13200-3457/+5376
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | Fix races in small mode compiler filters setupIan Rogers2013-08-136-20/+19
| * | | | | Fix small art build.Ian Rogers2013-08-131-4/+7
| * | | | | If CheckJNI is enabled don't allow app workaroundsIan Rogers2013-08-131-14/+6
| * | | | | Build fix.Ian Rogers2013-08-132-14/+14
| * | | | | Merge "Refactor java.lang.reflect implementation" into dalvik-devIan Rogers2013-08-14142-2042/+2052
| |\ \ \ \ \
| | * | | | | Refactor java.lang.reflect implementationBrian Carlstrom2013-08-13142-2042/+2052
| * | | | | | Merge "Clean up logcat spam from compiler and verifier" into dalvik-devAnwar Ghuloum2013-08-146-27/+37
| |\ \ \ \ \ \
| | * | | | | | Clean up logcat spam from compiler and verifierAnwar Ghuloum2013-08-136-27/+37
| | |/ / / / /
| * | | | | | Merge "Modify traceview to sample instead of instrumenting methods." into dal...Jeff Hao2013-08-142-10/+155
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Modify traceview to sample instead of instrumenting methods.Jeff Hao2013-08-132-10/+155
| * | | | | | Merge "Avoid a long alloc space lock contention during sticky GC sweep." into...Hiroshi Yamauchi2013-08-131-3/+25
| |\ \ \ \ \ \
| | * | | | | | Avoid a long alloc space lock contention during sticky GC sweep.Hiroshi Yamauchi2013-08-131-3/+25
| * | | | | | | C++11 support for ART.Mathieu Chartier2013-08-135-8/+11
| |/ / / / / /
| * | | | | | Merge "Add a systrace support for lock contention logging." into dalvik-devHiroshi Yamauchi2013-08-135-8/+18
| |\ \ \ \ \ \
| | * | | | | | Add a systrace support for lock contention logging.Hiroshi Yamauchi2013-08-135-8/+18
| * | | | | | | Merge "Work on SMALL_ART and PORTABLE working at the same time." into dalvik-devIan Rogers2013-08-1314-415/+557
| |\ \ \ \ \ \ \
| | * | | | | | | Work on SMALL_ART and PORTABLE working at the same time.Dragos Sbirlea2013-08-1314-415/+557
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge "Yet more timing logger cleanup" into dalvik-devAnwar Ghuloum2013-08-134-27/+28
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Yet more timing logger cleanupAnwar Ghuloum2013-08-134-27/+28
| * | | | | | | Revert "Update ART for LLVM merge up to r187914."Stephen Hines2013-08-132-2/+4
| * | | | | | | am e265ecf1: am 34de74bb: Merge "Update ART for LLVM merge up to r187914." in...Stephen Hines2013-08-132-4/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | am 34de74bb: Merge "Update ART for LLVM merge up to r187914." into klp-devStephen Hines2013-08-132-4/+2
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge "Update ART for LLVM merge up to r187914." into klp-devStephen Hines2013-08-132-4/+2
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Update ART for LLVM merge up to r187914.Stephen Hines2013-08-092-4/+2
| | * | | | | | Fix SMALL_ARTbuzbee2013-08-122-4/+5
| | | |/ / / / | | |/| | | |
| | * | | | | Merge "Timing logger clean-up" into dalvik-devAnwar Ghuloum2013-08-123-26/+23
| | |\ \ \ \ \
| | | * | | | | Timing logger clean-upAnwar Ghuloum2013-08-123-26/+23
| | * | | | | | Merge "Polish the lock contention logging." into dalvik-devHiroshi Yamauchi2013-08-123-128/+180
| | |\ \ \ \ \ \
| | | * | | | | | Polish the lock contention logging.Hiroshi Yamauchi2013-08-093-128/+180
| | * | | | | | | am 306eb0af: am 672a4230: Not all shared libraries have a JNI_OnLoad.Elliott Hughes2013-08-120-0/+0
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | * | | | | | am 672a4230: Not all shared libraries have a JNI_OnLoad.Elliott Hughes2013-08-121-0/+1
| | | |\ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | Not all shared libraries have a JNI_OnLoad.Elliott Hughes2013-08-121-0/+1