summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | am 5b792777: Remove unneeded PictureSet clearNicolas Roard2011-12-061-2/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Remove unneeded PictureSet clearNicolas Roard2011-12-061-2/+0
| |/ / / / /
* | | | | | am c8ec6fac: Merge "Support spellcheck on text areas" into ics-mr1John Reck2011-12-061-0/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Support spellcheck on text areas" into ics-mr1John Reck2011-12-061-0/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Support spellcheck on text areasJohn Reck2011-12-061-0/+1
* | | | | | am 1d71a5f4: Merge "Don\'t deep copy animations, prepare animations on both t...Chris Craik2011-12-066-102/+33
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Don't deep copy animations, prepare animations on both trees" into ics...Chris Craik2011-12-066-102/+33
| |\ \ \ \ \
| | * | | | | Don't deep copy animations, prepare animations on both treesJohn Reck2011-12-056-102/+33
| | |/ / / /
* | | | | | Merge "compiler error fix when DEBUG is on"Teng-Hui Zhu2011-12-063-5/+4
|\ \ \ \ \ \
| * | | | | | compiler error fix when DEBUG is onTeng-Hui Zhu2011-12-063-5/+4
* | | | | | | am c34cfbd2: Delete TextureGenerator operations outside the lockChris Craik2011-12-061-4/+4
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Delete TextureGenerator operations outside the lockChris Craik2011-12-051-4/+4
| | |/ / / / | |/| | | |
* | | | | | Merge "Add visual indicator for tree swap info"Teng-Hui Zhu2011-12-062-8/+36
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Add visual indicator for tree swap infoTeng-Hui Zhu2011-12-052-8/+36
* | | | | | Remove inFullScreenMode JNI call during drawGL call.George Mount2011-12-051-16/+2
|/ / / / /
* | | | | Increase the buffer count from query resultTeng-Hui Zhu2011-12-051-1/+5
* | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-050-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-020-0/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-020-0/+0
| | |\ \ \
* | | \ \ \ Merge "Add support for Float64Array."Ben Murdoch2011-12-0516-0/+323
|\ \ \ \ \ \
| * | | | | | Add support for Float64Array.Ben Murdoch2011-12-0216-0/+323
* | | | | | | am 3fb3b3e0: Merge "Revert "Set the exact buffer size to Surf Tex"" into ics-mr1Teng-Hui Zhu2011-12-021-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge "Revert "Set the exact buffer size to Surf Tex"" into ics-mr1Teng-Hui Zhu2011-12-021-1/+1
| |\ \ \ \ \ \
| | * | | | | | Revert "Set the exact buffer size to Surf Tex"Teng-Hui Zhu2011-12-021-1/+1
* | | | | | | | am f4bc9879: Merge "Maintain UI-side start times for animations in SW renderi...Chris Craik2011-12-023-0/+19
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Maintain UI-side start times for animations in SW rendering mode" into...Chris Craik2011-12-023-0/+19
| |\ \ \ \ \ \ \
| | * | | | | | | Maintain UI-side start times for animations in SW rendering modeChris Craik2011-12-023-0/+19
| | |/ / / / / /
* | | | | | | | am d428cef6: clip tile prepare bounds to content OR viewportChris Craik2011-12-021-15/+19
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | clip tile prepare bounds to content OR viewportChris Craik2011-12-021-15/+19
| |/ / / / / /
* | | | | | | am 243f1a9f: (-s ours) Merge "Turn off partial layer inval in MR1 - DO NOT ME...Chris Craik2011-12-020-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Turn off partial layer inval in MR1 - DO NOT MERGE" into ics-mr1Chris Craik2011-12-021-0/+4
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Turn off partial layer inval in MR1 - DO NOT MERGEChris Craik2011-12-011-0/+4
* | | | | | | Merge "Show the frame perf info for debug purpose"Teng-Hui Zhu2011-12-022-6/+39
|\ \ \ \ \ \ \
| * | | | | | | Show the frame perf info for debug purposeTeng-Hui Zhu2011-12-022-6/+39
* | | | | | | | Merge "Fix init and cleanup of WebCookieJar."Selim Gurun2011-12-022-8/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix init and cleanup of WebCookieJar.Selim Gurun2011-12-022-8/+2
| |/ / / / / / /
* | | | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-020-0/+0
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | |
| * | | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-010-0/+0
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-010-0/+0
| | |\ \ \ \ \
* | | \ \ \ \ \ am f286c7d3: Merge "Scroll position now passed to all layers" into ics-mr1Chris Craik2011-12-016-5/+37
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge "Scroll position now passed to all layers" into ics-mr1Chris Craik2011-12-016-5/+37
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Scroll position now passed to all layersChris Craik2011-12-016-5/+37
* | | | | | | am f1a22119: Merge "Fix image layer codepath" into ics-mr1Nicolas Roard2011-12-0120-223/+425
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Fix image layer codepath" into ics-mr1Nicolas Roard2011-12-0120-223/+425
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Fix image layer codepathNicolas Roard2011-11-3020-223/+425
* | | | | | | am f2dadfc1: Merge "Ensure font encoding is correct for drawing loopers." int...Derek Sollenberger2011-12-010-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Ensure font encoding is correct for drawing loopers." into ics-mr1Derek Sollenberger2011-12-011-0/+4
| |\ \ \ \ \ \
| | * | | | | | Ensure font encoding is correct for drawing loopers.Derek Sollenberger2011-11-301-0/+4
* | | | | | | | am 87f8fc15: Merge "add support for WebTextView on scrolling layers" into ics...Bart Sears2011-11-301-0/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "add support for WebTextView on scrolling layers" into ics-mr1Bart Sears2011-11-301-0/+11
| |\ \ \ \ \ \ \