Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
* | am df0d0295: Merge "Make System.loadLibrary use open(2) rather than stat(2)." | Elliott Hughes | 2012-11-05 | 3 | -31/+36 | |
|\ | ||||||
| * | Merge "Make System.loadLibrary use open(2) rather than stat(2)." | Elliott Hughes | 2012-11-05 | 3 | -31/+36 | |
| |\ | ||||||
| | * | Make System.loadLibrary use open(2) rather than stat(2). | Elliott Hughes | 2012-11-05 | 3 | -31/+36 | |
| |/ | ||||||
* | | Reconcile with jb-mr1-release - do not merge | The Android Open Source Project | 2012-11-05 | 0 | -0/+0 | |
|\ \ | ||||||
| * \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-11-02 | 0 | -0/+0 | |
| |\ \ | ||||||
* | \ \ | am fbc035d7: Merge "Make Runtime.availableProcessors report configured rather... | Elliott Hughes | 2012-11-02 | 1 | -39/+22 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | Merge "Make Runtime.availableProcessors report configured rather than on-line... | Elliott Hughes | 2012-11-02 | 1 | -39/+22 | |
| |\ \ \ | ||||||
| | * | | | Make Runtime.availableProcessors report configured rather than on-line proces... | Elliott Hughes | 2012-11-02 | 1 | -39/+22 | |
| |/ / / | ||||||
* | | | | am 2ba4f42e: Merge "Don\'t create as many temporary icu4c Locale objects." | Elliott Hughes | 2012-11-02 | 1 | -14/+12 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Merge "Don't create as many temporary icu4c Locale objects." | Elliott Hughes | 2012-11-02 | 1 | -14/+12 | |
| |\ \ \ | ||||||
| | * | | | Don't create as many temporary icu4c Locale objects. | Elliott Hughes | 2012-11-02 | 1 | -14/+12 | |
| |/ / / | ||||||
* | | | | Reconcile with jb-mr1-release - do not merge | The Android Open Source Project | 2012-11-02 | 0 | -0/+0 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-11-01 | 0 | -0/+0 | |
| |\ \ \ | ||||||
* | \ \ \ | am 85c4f329: Bump ThreadsTest tolerance from 5% to 10% | Brian Carlstrom | 2012-11-01 | 1 | -3/+3 | |
|\ \ \ \ \ | | |_|_|/ | |/| | | | ||||||
| * | | | | Bump ThreadsTest tolerance from 5% to 10% | Brian Carlstrom | 2012-11-01 | 1 | -3/+3 | |
| |/ / / | ||||||
* | | | | resolved conflicts for merge of eef7e935 to jb-mr1-dev-plus-aosp | Brian Carlstrom | 2012-11-01 | 3 | -10/+24 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Test to verify BC Signature algorithms by OID | Brian Carlstrom | 2012-11-01 | 3 | -10/+24 | |
| | | | | ||||||
| \ \ \ | ||||||
*-. \ \ \ | Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge | The Android Open Source Project | 2012-10-31 | 0 | -0/+0 | |
|\ \ \ \ \ | | | |/ / | | |/| | | ||||||
| | * | | | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-20 | 0 | -0/+0 | |
| | |\ \ \ | | | |/ / | | |/| | | ||||||
| | | * | | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-17 | 0 | -0/+0 | |
| | | |\ \ | ||||||
| | | | * \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-16 | 0 | -0/+0 | |
| | | | |\ \ | ||||||
| | | | | * \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-16 | 0 | -0/+0 | |
| | | | | |\ \ | ||||||
| * | | | | \ \ | merge in jb-mr1-factory-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-15 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ | am 372334da: Merge "Make private static field final." | Ian Rogers | 2012-10-30 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | ||||||
| * | | | | | | | | Merge "Make private static field final." | Ian Rogers | 2012-10-30 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Make private static field final. | Ian Rogers | 2012-10-30 | 1 | -2/+2 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | am 93ee28de: Merge "Fix misuses of assert in OldClassTest and comment out oth... | Elliott Hughes | 2012-10-29 | 6 | -19/+19 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | Merge "Fix misuses of assert in OldClassTest and comment out other libcore as... | Elliott Hughes | 2012-10-29 | 6 | -19/+19 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Fix misuses of assert in OldClassTest and comment out other libcore asserts. | Elliott Hughes | 2012-10-29 | 6 | -19/+19 | |
* | | | | | | | | | | am adcea0bf: Merge "Prefer PKIX algorithm name for TrustManagerFactory and Ke... | Brian Carlstrom | 2012-10-29 | 14 | -59/+63 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | ||||||
| * | | | | | | | | | Merge "Prefer PKIX algorithm name for TrustManagerFactory and KeyManagerFactory" | Brian Carlstrom | 2012-10-29 | 14 | -59/+63 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | ||||||
| | * | | | | | | | | Prefer PKIX algorithm name for TrustManagerFactory and KeyManagerFactory | Brian Carlstrom | 2012-10-29 | 14 | -59/+63 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | am 595ea24b: Merge "Restore some java.security package documentation" | Brian Carlstrom | 2012-10-29 | 1 | -3/+6 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | Merge "Restore some java.security package documentation" | Brian Carlstrom | 2012-10-29 | 1 | -3/+6 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Restore some java.security package documentation | Brian Carlstrom | 2012-10-29 | 1 | -3/+6 | |
* | | | | | | | | | | am 7071a500: Merge "Fix libcore\'s usage of readdir_r(3)." | Elliott Hughes | 2012-10-29 | 1 | -6/+7 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | ||||||
| * | | | | | | | | | Merge "Fix libcore's usage of readdir_r(3)." | Elliott Hughes | 2012-10-26 | 1 | -6/+7 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | ||||||
| | * | | | | | | | | Fix libcore's usage of readdir_r(3). | Elliott Hughes | 2012-10-26 | 1 | -6/+7 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | am b6cf9117: Merge "Support zone.tab in libcore, and remove the file format v... | Elliott Hughes | 2012-10-22 | 1 | -9/+0 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | Merge "Support zone.tab in libcore, and remove the file format version." | Elliott Hughes | 2012-10-22 | 1 | -9/+0 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Support zone.tab in libcore, and remove the file format version. | Elliott Hughes | 2012-10-22 | 1 | -9/+0 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | am bce53b55: Merge "Make libcore look in /data/misc for tzdata updates." | Elliott Hughes | 2012-10-22 | 1 | -3/+13 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | Merge "Make libcore look in /data/misc for tzdata updates." | Elliott Hughes | 2012-10-22 | 1 | -3/+13 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Make libcore look in /data/misc for tzdata updates. | Elliott Hughes | 2012-10-22 | 1 | -3/+13 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | am 50e0be63: Wait for threads to finish in ThreadsTest before continuing | Brian Carlstrom | 2012-10-19 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | Wait for threads to finish in ThreadsTest before continuing | Brian Carlstrom | 2012-10-18 | 1 | -19/+22 | |
| | |_|_|/ / / / | |/| | | | | | | ||||||
* | | | | | | | | am 5af1943e: Merge "Wait for threads to finish in ThreadsTest before continuing" | Brian Carlstrom | 2012-10-19 | 1 | -19/+22 | |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| * | | | | | | | Merge "Wait for threads to finish in ThreadsTest before continuing" | Brian Carlstrom | 2012-10-19 | 1 | -19/+22 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | Wait for threads to finish in ThreadsTest before continuing | Brian Carlstrom | 2012-10-19 | 1 | -19/+22 | |
* | | | | | | | | | am 2c18c0d4: Merge "Fix ThreadsTest use of CyclicBarrier" | Brian Carlstrom | 2012-10-19 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |