summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge "Fix m.movies.com crash"John Reck2012-03-021-5/+12
|\ \ \ \ \
| * | | | | Fix m.movies.com crashJohn Reck2012-03-011-5/+12
* | | | | | am 34ee8eba: am 282bc0d6: am f8596f1a: Reconcile with AOSPJean-Baptiste Queru2012-03-020-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | 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 e9ecd44a: am b181d718: 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
| | | |\ \ \ \
* | | | | | | | Fixup webkit for WebViewClassic renameJonathan Dixon2012-03-024-12/+12
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge "Fix iframe, for reals!"Nicolas Roard2012-03-0115-152/+101
|\ \ \ \ \ \ \
| * | | | | | | Fix iframe, for reals!John Reck2012-03-0115-152/+101
* | | | | | | | am b0a4d0fd: am 49558a90: am f2296bfb: Merge from ics-mr1Jean-Baptiste Queru2012-03-010-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 1501be14: am 73aa2647: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-03-010-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 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
| | |\ \ \ \ \ \
* | | \ \ \ \ \ \ Merge "Add one useful log"Teng-Hui Zhu2012-03-011-0/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Add one useful logTeng-Hui Zhu2012-03-011-0/+1
* | | | | | | | | Merge "Minor cleanup in PictureSet"John Reck2012-03-014-105/+57
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Minor cleanup in PictureSetJohn Reck2012-03-014-105/+57
* | | | | | | | | | Merge "take proper credit for overflow scrolling support"Victoria Lease2012-03-012-0/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | take proper credit for overflow scrolling supportVictoria Lease2012-03-012-0/+5
* | | | | | | | | | | am 6b9501fc: am 4462099f: 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
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
* | | | | | | | | | | Merge "Cleanup GL resource for HTML5 Video."Teng-Hui Zhu2012-03-015-133/+171
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | / / / / | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | Cleanup GL resource for HTML5 Video.Teng-Hui Zhu2012-03-015-133/+171
* | | | | | | | | | Merge "pin find-on-page scrolls to content edges"Victoria Lease2012-03-011-10/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | pin find-on-page scrolls to content edgesVictoria Lease2012-03-011-10/+15
* | | | | | | | | | | fix stalls in tile updatesChris Craik2012-02-292-2/+10
| |_|_|_|_|_|/ / / / |/| | | | | | | | |
* | | | | | | | | | Merge "Add support for maxlength text fields to WebViewInputConnection."George Mount2012-02-292-2/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add support for maxlength text fields to WebViewInputConnection.George Mount2012-02-282-2/+14
* | | | | | | | | | | Merge "layer rendering cleanup/rewrite"Chris Craik2012-02-2833-1190/+1175
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | layer rendering cleanup/rewriteChris Craik2012-02-2833-1190/+1175
* | | | | | | | | | | Merge "Delete the GL shader resources in a cleaner way"Teng-Hui Zhu2012-02-286-25/+56
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Delete the GL shader resources in a cleaner wayTeng-Hui Zhu2012-02-286-25/+56
* | | | | | | | | | | | am 5d6d6060: am 4bdb7d7b: am 538b01d6: Cherry-pick WebKit r100677 to fix a re...Steve Block2012-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 797ef404: am c892a72d: am 538b01d6: Cherry-pick WebKit r100677 to fix a re...Steve 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
* | | | | | | | | | | Merge "removed unused vars/functions"Chris Craik2012-02-287-39/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | removed unused vars/functionsChris Craik2012-02-287-39/+2
| | |_|_|_|/ / / / / / | |/| | | | | | | | |