summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am ff1fac5a: am 1969832e: Merge "Update WebKit with necessary changes for the...Derek Sollenberger2012-03-127-112/+19
|\
| * am 1969832e: Merge "Update WebKit with necessary changes for the Skia merge."Derek Sollenberger2012-03-127-112/+19
| |\
| | * Merge "Update WebKit with necessary changes for the Skia merge."Derek Sollenberger2012-03-127-112/+19
| | |\
| | | * Update WebKit with necessary changes for the Skia merge.Derek Sollenberger2012-03-067-112/+19
| | |/
* | | am 282bc0d6: am f8596f1a: Reconcile with AOSPJean-Baptiste Queru2012-03-020-0/+0
|\ \ \
| * \ \ am f8596f1a: Reconcile with AOSPJean-Baptiste Queru2012-03-020-0/+0
| |\ \ \
* | \ \ \ am b181d718: am f8596f1a: Reconcile with AOSPJean-Baptiste Queru2012-03-020-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | am f8596f1a: Reconcile with AOSPJean-Baptiste Queru2012-03-020-0/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Reconcile with AOSPJean-Baptiste Queru2012-03-020-0/+0
| | |\ \ \
* | | \ \ \ am 49558a90: am f2296bfb: Merge from ics-mr1Jean-Baptiste Queru2012-03-010-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am f2296bfb: Merge from ics-mr1Jean-Baptiste Queru2012-03-010-0/+0
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge from ics-mr1Jean-Baptiste Queru2012-03-011-8/+13
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Cherry-pick WebKit r100677 to fix a rendering crashSteve Block2012-03-011-8/+13
* | | | | | am 73aa2647: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-03-010-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-03-010-0/+0
| |\ \ \ \ \
* | \ \ \ \ \ am 4462099f: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-03-010-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-03-010-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-02-280-0/+0
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
* | | | | | | am 4bdb7d7b: am 538b01d6: Cherry-pick WebKit r100677 to fix a rendering crashSteve Block2012-02-280-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | am 538b01d6: Cherry-pick WebKit r100677 to fix a rendering crashSteve Block2012-02-281-8/+13
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
* | | | | | | am c892a72d: am 538b01d6: Cherry-pick WebKit r100677 to fix a rendering crashSteve Block2012-02-281-8/+13
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | am 538b01d6: Cherry-pick WebKit r100677 to fix a rendering crashSteve Block2012-02-281-8/+13
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Cherry-pick WebKit r100677 to fix a rendering crashSteve Block2012-02-281-8/+13
* | | | | | | am 98087315: am 2285ad26: Merge "Only check ARCH_ARM_HAVE_ARMV7A if TARGET_AR...Jean-Baptiste Queru2012-02-161-4/+6
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 2285ad26: Merge "Only check ARCH_ARM_HAVE_ARMV7A if TARGET_ARCH is arm"Jean-Baptiste Queru2012-02-161-4/+6
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge "Only check ARCH_ARM_HAVE_ARMV7A if TARGET_ARCH is arm"Jean-Baptiste Queru2012-02-161-4/+6
| | |\ \ \ \ \
| | | * | | | | Only check ARCH_ARM_HAVE_ARMV7A if TARGET_ARCH is armChih-Wei Huang2012-02-161-4/+6
| | |/ / / / /
* | | | | | | am 75a0da9a: am 2857538e: Skia API changes as a result of an update to the Sk...Derek Sollenberger2012-02-066-16/+9
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 2857538e: Skia API changes as a result of an update to the Skia library.Derek Sollenberger2012-02-066-16/+9
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Skia API changes as a result of an update to the Skia library.Derek Sollenberger2012-01-316-16/+9
* | | | | | | am f1c43830: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | |
| * | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
| |\ \ \ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | |/| |
* | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-190-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-130-0/+0
| |\ \ \ \ | | |/ / / | |/| | |
* | | | | am 3c049d2a: Prevent infinite loop when turning on then off composited modeNicolas Roard2012-01-131-0/+14
|\ \ \ \ \ | |/ / / /
| * | | | Prevent infinite loop when turning on then off composited modeNicolas Roard2012-01-121-0/+14
* | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-120-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-110-0/+0
| |\ \ \ \ | | |/ / / | |/| | |
* | | | | am b627d5bd: Fully invalidate the pictureset when content size changesChris Craik2012-01-111-21/+14
|\ \ \ \ \ | |/ / / /
| * | | | Fully invalidate the pictureset when content size changesChris Craik2012-01-101-21/+14
* | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-050-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-040-0/+0
| |\ \ \ \ | | |/ / / | |/| | |
* | | | | am f62e398f: Merge "Enable History API. Do not merge." into ics-mr1Bart Sears2012-01-041-0/+7
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Enable History API. Do not merge." into ics-mr1Bart Sears2012-01-041-0/+7
| |\ \ \ \
| | * | | | Enable History API. Do not merge.Ben Murdoch2012-01-041-0/+7
| | | |_|/ | | |/| |
* | | | | am d13df54b: Merge "Fix crash with composited layers - DO NOT MERGE" into ics...Bart Sears2012-01-043-4/+51
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix crash with composited layers - DO NOT MERGE" into ics-mr1Bart Sears2012-01-043-4/+51
| |\ \ \ \
| | * | | | Fix crash with composited layers - DO NOT MERGENicolas Roard2012-01-033-4/+51
| | |/ / /
* | | | | am 08a2aede: Merge "When in singlesurfacemode, resist switching out - DO NOT ...Chris Craik2012-01-041-0/+7
|\ \ \ \ \ | |/ / / /
| * | | | Merge "When in singlesurfacemode, resist switching out - DO NOT MERGE" into i...Chris Craik2012-01-041-0/+7
| |\ \ \ \