summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add updateProcessState to VMRuntimeMathieu Chartier2013-07-182-0/+13
* Add registerNativeAllocation and registerNativeFree to libcore.Mathieu Chartier2013-07-161-0/+15
* am e69c2998: (-s ours) Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-07-150-0/+0
|\
| * Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-07-150-0/+0
| |\
| | * merge in jb-mr2-zeroday-release history after reset to jb-mr2-devThe Android Automerger2013-07-150-0/+0
| | |\
* | | \ am 63e17f1c: am ecdc71ca: am 3f3fdd79: Merge "Fix Class.getMethod docs."Elliott Hughes2013-07-111-8/+13
|\ \ \ \ | |/ / /
| * | | am ecdc71ca: am 3f3fdd79: Merge "Fix Class.getMethod docs."Elliott Hughes2013-07-111-8/+13
| |\ \ \
| | * \ \ am 3f3fdd79: Merge "Fix Class.getMethod docs."Elliott Hughes2013-07-111-8/+13
| | |\ \ \
| | | * \ \ Merge "Fix Class.getMethod docs."Elliott Hughes2013-07-111-8/+13
| | | |\ \ \
| | | | * | | Fix Class.getMethod docs.Elliott Hughes2013-07-111-8/+13
| | | |/ / /
* | | | | | am c36cc0f8: am be028b0f: am 04371b44: Merge "Implement JSONObject.wrap, and ...Elliott Hughes2013-07-114-6/+110
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am be028b0f: am 04371b44: Merge "Implement JSONObject.wrap, and use it."Elliott Hughes2013-07-114-6/+110
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 04371b44: Merge "Implement JSONObject.wrap, and use it."Elliott Hughes2013-07-114-6/+110
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "Implement JSONObject.wrap, and use it."Elliott Hughes2013-07-114-6/+110
| | | |\ \ \
| | | | * | | Implement JSONObject.wrap, and use it.Elliott Hughes2013-07-114-6/+110
| | | |/ / /
* | | | | | am 5d68ce48: am 8f734144: am 5aced732: am c1ee1ac7: am 99663789: am b3e2cc46:...Elliott Hughes2013-07-110-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 8f734144: am 5aced732: am c1ee1ac7: am 99663789: am b3e2cc46: am adf25974:...Elliott Hughes2013-07-110-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | am 5aced732: am c1ee1ac7: am 99663789: am b3e2cc46: am adf25974: am 15a93894:...Elliott Hughes2013-07-111-44/+137
| | |\ \ \ \
| | | * \ \ \ am c1ee1ac7: am 99663789: am b3e2cc46: am adf25974: am 15a93894: Tests for ZI...Elliott Hughes2013-07-111-44/+137
| | | |\ \ \ \
| | | | * \ \ \ am 99663789: am b3e2cc46: am adf25974: am 15a93894: Tests for ZIP sign extens...Elliott Hughes2013-07-111-44/+137
| | | | |\ \ \ \
| | | | | * \ \ \ am b3e2cc46: am adf25974: am 15a93894: Tests for ZIP sign extension bugs.Elliott Hughes2013-07-111-44/+137
| | | | | |\ \ \ \
| | | | | | * \ \ \ am adf25974: am 15a93894: Tests for ZIP sign extension bugs.Elliott Hughes2013-07-111-44/+137
| | | | | | |\ \ \ \
| | | | | | | * \ \ \ am 15a93894: Tests for ZIP sign extension bugs.Elliott Hughes2013-07-111-44/+137
| | | | | | | |\ \ \ \
| | | | | | | | * | | | Tests for ZIP sign extension bugs.Elliott Hughes2013-07-111-44/+137
* | | | | | | | | | | | am e3b73c47: am 9cb2e62f: am e94a2d12: Merge "Implement JSONArray.remove."Elliott Hughes2013-07-112-4/+28
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 9cb2e62f: am e94a2d12: Merge "Implement JSONArray.remove."Elliott Hughes2013-07-092-4/+28
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| | * | | | | | | | | | am e94a2d12: Merge "Implement JSONArray.remove."Elliott Hughes2013-07-092-4/+28
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge "Implement JSONArray.remove."Elliott Hughes2013-07-102-4/+28
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Implement JSONArray.remove.Elliott Hughes2013-07-092-4/+28
| | | |/ / / / / / / / /
* | | | | | | | | | | | am bec56674: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-07-110-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-07-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Values in ZIP files are unsigned.Elliott Hughes2013-07-092-9/+9
* | | | | | | | | | | | | am 5804cde9: am 53296749: am 131dcd13: Merge "Fix Selector to allow read and ...Elliott Hughes2013-07-112-15/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am 53296749: am 131dcd13: Merge "Fix Selector to allow read and write at the ...Elliott Hughes2013-07-092-15/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | am 131dcd13: Merge "Fix Selector to allow read and write at the same time."Elliott Hughes2013-07-092-15/+45
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge "Fix Selector to allow read and write at the same time."Elliott Hughes2013-07-092-15/+45
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Fix Selector to allow read and write at the same time.Elliott Hughes2013-07-092-15/+45
| | | |/ / / / / / / / / /
* | | | | | | | | | | | | am d574108e: am 029b00d6: am ec618403: Merge "Switch libcore from statfs to s...Elliott Hughes2013-07-118-101/+110
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am 029b00d6: am ec618403: Merge "Switch libcore from statfs to statvfs."Elliott Hughes2013-07-098-101/+110
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | am ec618403: Merge "Switch libcore from statfs to statvfs."Elliott Hughes2013-07-098-101/+110
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | Merge "Switch libcore from statfs to statvfs."Elliott Hughes2013-07-098-101/+110
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Switch libcore from statfs to statvfs.Elliott Hughes2013-07-098-101/+110
| | | |/ / / / / / / / / /
* | | | | | | | | | | | | am 8757d9e6: am e9de0dc2: am 210b16cc: Merge "Tests for ZIP sign extension bu...Elliott Hughes2013-07-111-44/+137
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am e9de0dc2: am 210b16cc: Merge "Tests for ZIP sign extension bugs."Elliott Hughes2013-07-091-44/+137
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | am 210b16cc: Merge "Tests for ZIP sign extension bugs."Elliott Hughes2013-07-091-44/+137
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | Merge "Tests for ZIP sign extension bugs."Elliott Hughes2013-07-091-44/+137
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Tests for ZIP sign extension bugs.Elliott Hughes2013-07-091-44/+137
| | | |/ / / / / / / / / /
* | | | | | | | | | | | | Cleaning old JIT methods from String.Jeff Hao2013-07-091-69/+0
* | | | | | | | | | | | | Fix Class.getModifiers for arrays of inner classes.Elliott Hughes2013-07-091-1/+14
* | | | | | | | | | | | | Add dalvik.system.VMRuntime.vmLibraryBrian Carlstrom2013-07-092-0/+10