summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am df0d0295: Merge "Make System.loadLibrary use open(2) rather than stat(2)."Elliott Hughes2012-11-053-31/+36
|\
| * Merge "Make System.loadLibrary use open(2) rather than stat(2)."Elliott Hughes2012-11-053-31/+36
| |\
| | * Make System.loadLibrary use open(2) rather than stat(2).Elliott Hughes2012-11-053-31/+36
| |/
* | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-11-050-0/+0
|\ \
| * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-11-020-0/+0
| |\ \
* | \ \ am fbc035d7: Merge "Make Runtime.availableProcessors report configured rather...Elliott Hughes2012-11-021-39/+22
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge "Make Runtime.availableProcessors report configured rather than on-line...Elliott Hughes2012-11-021-39/+22
| |\ \ \
| | * | | Make Runtime.availableProcessors report configured rather than on-line proces...Elliott Hughes2012-11-021-39/+22
| |/ / /
* | | | am 2ba4f42e: Merge "Don\'t create as many temporary icu4c Locale objects."Elliott Hughes2012-11-021-14/+12
|\ \ \ \ | |/ / /
| * | | Merge "Don't create as many temporary icu4c Locale objects."Elliott Hughes2012-11-021-14/+12
| |\ \ \
| | * | | Don't create as many temporary icu4c Locale objects.Elliott Hughes2012-11-021-14/+12
| |/ / /
* | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-11-020-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-11-010-0/+0
| |\ \ \
* | \ \ \ am 85c4f329: Bump ThreadsTest tolerance from 5% to 10%Brian Carlstrom2012-11-011-3/+3
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Bump ThreadsTest tolerance from 5% to 10%Brian Carlstrom2012-11-011-3/+3
| |/ / /
* | | | resolved conflicts for merge of eef7e935 to jb-mr1-dev-plus-aospBrian Carlstrom2012-11-013-10/+24
|\ \ \ \ | |/ / /
| * | | Test to verify BC Signature algorithms by OIDBrian Carlstrom2012-11-013-10/+24
| | | |
| \ \ \
*-. \ \ \ Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-10-310-0/+0
|\ \ \ \ \ | | | |/ / | | |/| |
| | * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-200-0/+0
| | |\ \ \ | | | |/ / | | |/| |
| | | * | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-170-0/+0
| | | |\ \
| | | | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-160-0/+0
| | | | |\ \
| | | | | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-160-0/+0
| | | | | |\ \
| * | | | | \ \ merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger2012-10-150-0/+0
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ am 372334da: Merge "Make private static field final."Ian Rogers2012-10-301-2/+2
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge "Make private static field final."Ian Rogers2012-10-301-2/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Make private static field final.Ian Rogers2012-10-301-2/+2
| |/ / / / / / / /
* | | | | | | | | am 93ee28de: Merge "Fix misuses of assert in OldClassTest and comment out oth...Elliott Hughes2012-10-296-19/+19
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Fix misuses of assert in OldClassTest and comment out other libcore as...Elliott Hughes2012-10-296-19/+19
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix misuses of assert in OldClassTest and comment out other libcore asserts.Elliott Hughes2012-10-296-19/+19
* | | | | | | | | | am adcea0bf: Merge "Prefer PKIX algorithm name for TrustManagerFactory and Ke...Brian Carlstrom2012-10-2914-59/+63
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "Prefer PKIX algorithm name for TrustManagerFactory and KeyManagerFactory"Brian Carlstrom2012-10-2914-59/+63
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Prefer PKIX algorithm name for TrustManagerFactory and KeyManagerFactoryBrian Carlstrom2012-10-2914-59/+63
| |/ / / / / / / /
* | | | | | | | | am 595ea24b: Merge "Restore some java.security package documentation"Brian Carlstrom2012-10-291-3/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Restore some java.security package documentation"Brian Carlstrom2012-10-291-3/+6
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Restore some java.security package documentationBrian Carlstrom2012-10-291-3/+6
* | | | | | | | | | am 7071a500: Merge "Fix libcore\'s usage of readdir_r(3)."Elliott Hughes2012-10-291-6/+7
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "Fix libcore's usage of readdir_r(3)."Elliott Hughes2012-10-261-6/+7
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Fix libcore's usage of readdir_r(3).Elliott Hughes2012-10-261-6/+7
| |/ / / / / / / /
* | | | | | | | | am b6cf9117: Merge "Support zone.tab in libcore, and remove the file format v...Elliott Hughes2012-10-221-9/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Support zone.tab in libcore, and remove the file format version."Elliott Hughes2012-10-221-9/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Support zone.tab in libcore, and remove the file format version.Elliott Hughes2012-10-221-9/+0
| |/ / / / / / / /
* | | | | | | | | am bce53b55: Merge "Make libcore look in /data/misc for tzdata updates."Elliott Hughes2012-10-221-3/+13
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Make libcore look in /data/misc for tzdata updates."Elliott Hughes2012-10-221-3/+13
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Make libcore look in /data/misc for tzdata updates.Elliott Hughes2012-10-221-3/+13
| |/ / / / / / / /
* | | | | | | | | am 50e0be63: Wait for threads to finish in ThreadsTest before continuingBrian Carlstrom2012-10-190-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Wait for threads to finish in ThreadsTest before continuingBrian Carlstrom2012-10-181-19/+22
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | am 5af1943e: Merge "Wait for threads to finish in ThreadsTest before continuing"Brian Carlstrom2012-10-191-19/+22
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge "Wait for threads to finish in ThreadsTest before continuing"Brian Carlstrom2012-10-191-19/+22
| |\ \ \ \ \ \ \
| | * | | | | | | Wait for threads to finish in ThreadsTest before continuingBrian Carlstrom2012-10-191-19/+22
* | | | | | | | | am 2c18c0d4: Merge "Fix ThreadsTest use of CyclicBarrier"Brian Carlstrom2012-10-190-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /