Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am ff1fac5a: am 1969832e: Merge "Update WebKit with necessary changes for the... | Derek Sollenberger | 2012-03-12 | 7 | -112/+19 |
|\ | |||||
| * | am 1969832e: Merge "Update WebKit with necessary changes for the Skia merge." | Derek Sollenberger | 2012-03-12 | 7 | -112/+19 |
| |\ | |||||
| | * | Merge "Update WebKit with necessary changes for the Skia merge." | Derek Sollenberger | 2012-03-12 | 7 | -112/+19 |
| | |\ | |||||
| | | * | Update WebKit with necessary changes for the Skia merge. | Derek Sollenberger | 2012-03-06 | 7 | -112/+19 |
| | |/ | |||||
* | | | am 282bc0d6: am f8596f1a: Reconcile with AOSP | Jean-Baptiste Queru | 2012-03-02 | 0 | -0/+0 |
|\ \ \ | |||||
| * \ \ | am f8596f1a: Reconcile with AOSP | Jean-Baptiste Queru | 2012-03-02 | 0 | -0/+0 |
| |\ \ \ | |||||
* | \ \ \ | am b181d718: am f8596f1a: Reconcile with AOSP | Jean-Baptiste Queru | 2012-03-02 | 0 | -0/+0 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | am f8596f1a: Reconcile with AOSP | Jean-Baptiste Queru | 2012-03-02 | 0 | -0/+0 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Reconcile with AOSP | Jean-Baptiste Queru | 2012-03-02 | 0 | -0/+0 |
| | |\ \ \ | |||||
* | | \ \ \ | am 49558a90: am f2296bfb: Merge from ics-mr1 | Jean-Baptiste Queru | 2012-03-01 | 0 | -0/+0 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am f2296bfb: Merge from ics-mr1 | Jean-Baptiste Queru | 2012-03-01 | 0 | -0/+0 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Merge from ics-mr1 | Jean-Baptiste Queru | 2012-03-01 | 1 | -8/+13 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | | * | | | Cherry-pick WebKit r100677 to fix a rendering crash | Steve Block | 2012-03-01 | 1 | -8/+13 |
* | | | | | | am 73aa2647: Reconcile with ics-mr1-release | The Android Open Source Project | 2012-03-01 | 0 | -0/+0 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Reconcile with ics-mr1-release | The Android Open Source Project | 2012-03-01 | 0 | -0/+0 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | am 4462099f: Reconcile with ics-mr1-release | The Android Open Source Project | 2012-03-01 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Reconcile with ics-mr1-release | The Android Open Source Project | 2012-03-01 | 0 | -0/+0 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2012-02-28 | 0 | -0/+0 |
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
* | | | | | | | am 4bdb7d7b: am 538b01d6: Cherry-pick WebKit r100677 to fix a rendering crash | Steve Block | 2012-02-28 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | am 538b01d6: Cherry-pick WebKit r100677 to fix a rendering crash | Steve Block | 2012-02-28 | 1 | -8/+13 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
* | | | | | | | am c892a72d: am 538b01d6: Cherry-pick WebKit r100677 to fix a rendering crash | Steve Block | 2012-02-28 | 1 | -8/+13 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | am 538b01d6: Cherry-pick WebKit r100677 to fix a rendering crash | Steve Block | 2012-02-28 | 1 | -8/+13 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | Cherry-pick WebKit r100677 to fix a rendering crash | Steve Block | 2012-02-28 | 1 | -8/+13 |
* | | | | | | | am 98087315: am 2285ad26: Merge "Only check ARCH_ARM_HAVE_ARMV7A if TARGET_AR... | Jean-Baptiste Queru | 2012-02-16 | 1 | -4/+6 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am 2285ad26: Merge "Only check ARCH_ARM_HAVE_ARMV7A if TARGET_ARCH is arm" | Jean-Baptiste Queru | 2012-02-16 | 1 | -4/+6 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | Merge "Only check ARCH_ARM_HAVE_ARMV7A if TARGET_ARCH is arm" | Jean-Baptiste Queru | 2012-02-16 | 1 | -4/+6 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Only check ARCH_ARM_HAVE_ARMV7A if TARGET_ARCH is arm | Chih-Wei Huang | 2012-02-16 | 1 | -4/+6 |
| | |/ / / / / | |||||
* | | | | | | | am 75a0da9a: am 2857538e: Skia API changes as a result of an update to the Sk... | Derek Sollenberger | 2012-02-06 | 6 | -16/+9 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am 2857538e: Skia API changes as a result of an update to the Skia library. | Derek Sollenberger | 2012-02-06 | 6 | -16/+9 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Skia API changes as a result of an update to the Skia library. | Derek Sollenberger | 2012-01-31 | 6 | -16/+9 |
* | | | | | | | am f1c43830: Reconcile with ics-mr1-release | The Android Open Source Project | 2012-02-01 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | | | |||||
| * | | | | | Reconcile with ics-mr1-release | The Android Open Source Project | 2012-02-01 | 0 | -0/+0 |
| |\ \ \ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | |/| | | |||||
* | | | | | Reconcile with ics-mr1-release | The Android Open Source Project | 2012-01-19 | 0 | -0/+0 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2012-01-13 | 0 | -0/+0 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
* | | | | | am 3c049d2a: Prevent infinite loop when turning on then off composited mode | Nicolas Roard | 2012-01-13 | 1 | -0/+14 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Prevent infinite loop when turning on then off composited mode | Nicolas Roard | 2012-01-12 | 1 | -0/+14 |
* | | | | | Reconcile with ics-mr1-release | The Android Open Source Project | 2012-01-12 | 0 | -0/+0 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2012-01-11 | 0 | -0/+0 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
* | | | | | am b627d5bd: Fully invalidate the pictureset when content size changes | Chris Craik | 2012-01-11 | 1 | -21/+14 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fully invalidate the pictureset when content size changes | Chris Craik | 2012-01-10 | 1 | -21/+14 |
* | | | | | Reconcile with ics-mr1-release | The Android Open Source Project | 2012-01-05 | 0 | -0/+0 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2012-01-04 | 0 | -0/+0 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
* | | | | | am f62e398f: Merge "Enable History API. Do not merge." into ics-mr1 | Bart Sears | 2012-01-04 | 1 | -0/+7 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge "Enable History API. Do not merge." into ics-mr1 | Bart Sears | 2012-01-04 | 1 | -0/+7 |
| |\ \ \ \ | |||||
| | * | | | | Enable History API. Do not merge. | Ben Murdoch | 2012-01-04 | 1 | -0/+7 |
| | | |_|/ | | |/| | | |||||
* | | | | | am d13df54b: Merge "Fix crash with composited layers - DO NOT MERGE" into ics... | Bart Sears | 2012-01-04 | 3 | -4/+51 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge "Fix crash with composited layers - DO NOT MERGE" into ics-mr1 | Bart Sears | 2012-01-04 | 3 | -4/+51 |
| |\ \ \ \ | |||||
| | * | | | | Fix crash with composited layers - DO NOT MERGE | Nicolas Roard | 2012-01-03 | 3 | -4/+51 |
| | |/ / / | |||||
* | | | | | am 08a2aede: Merge "When in singlesurfacemode, resist switching out - DO NOT ... | Chris Craik | 2012-01-04 | 1 | -0/+7 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge "When in singlesurfacemode, resist switching out - DO NOT MERGE" into i... | Chris Craik | 2012-01-04 | 1 | -0/+7 |
| |\ \ \ \ |