summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fix Java Bridge when coercing JavaScript string to Java char in arrays"Steve Block2011-11-161-18/+10
|\
| * Fix Java Bridge when coercing JavaScript string to Java char in arraysSteve Block2011-11-151-18/+10
* | am 73a306c4: Merge "Fix CacheManager to correctly write CacheFiles to disk." ...Ben Murdoch2011-11-162-6/+6
|\ \
| * \ Merge "Fix CacheManager to correctly write CacheFiles to disk." into ics-mr1Ben Murdoch2011-11-162-6/+6
| |\ \
| | * | Fix CacheManager to correctly write CacheFiles to disk.Ben Murdoch2011-11-152-6/+6
* | | | am fbcfce66: Merge "Use the transformed clipping rect for media layers (flash...Bart Sears2011-11-151-1/+2
|\ \ \ \ | |/ / /
| * | | Merge "Use the transformed clipping rect for media layers (flash plugin)" int...Bart Sears2011-11-151-1/+2
| |\ \ \
| | * | | Use the transformed clipping rect for media layers (flash plugin)Nicolas Roard2011-11-151-1/+2
| | |/ /
* | | | am 29244862: Fix text selection handle positioningJohn Reck2011-11-153-3/+14
|\ \ \ \ | |/ / /
| * | | Fix text selection handle positioningJohn Reck2011-11-153-3/+14
| |/ /
* | | Merge "Mask display of zero-width characters"Russell Brenner2011-11-151-1/+6
|\ \ \
| * | | Mask display of zero-width charactersRussell Brenner2011-11-151-1/+6
* | | | am 61a90836: Only mark tiles as dirty if the inval region actually intersectsNicolas Roard2011-11-151-0/+24
|\ \ \ \ | | |/ / | |/| |
| * | | Only mark tiles as dirty if the inval region actually intersectsNicolas Roard2011-11-141-0/+24
* | | | am 4c64d282: Use a single shared bitmap instead of one per BaseTile.Nicolas Roard2011-11-142-10/+15
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Use a single shared bitmap instead of one per BaseTile.Nicolas Roard2011-11-142-10/+15
* | | Merge "Fix for bug 5594865: Network error"Kristian Monsen2011-11-141-0/+1
|\ \ \ | |_|/ |/| |
| * | Fix for bug 5594865: Network errorKristian Monsen2011-11-141-0/+1
* | | am 7c2e38b6: Merge "Enable SPDY protocol." into ics-mr1Selim Gurun2011-11-111-2/+1
|\ \ \ | | |/ | |/|
| * | Merge "Enable SPDY protocol." into ics-mr1Selim Gurun2011-11-111-2/+1
| |\ \
| | * | Enable SPDY protocol.Selim Gurun2011-11-101-2/+1
* | | | am e5c39206: Remove inset for WebTextViewMichael Kolb2011-11-111-2/+2
|\ \ \ \ | |/ / /
| * | | Remove inset for WebTextViewMichael Kolb2011-11-111-2/+2
* | | | am 0de683c1: Merge "Fix combobox metrics and asset scaling" into ics-mr1Michael Kolb2011-11-113-17/+40
|\ \ \ \ | |/ / /
| * | | Merge "Fix combobox metrics and asset scaling" into ics-mr1Michael Kolb2011-11-113-17/+40
| |\ \ \
| | * | | Fix combobox metrics and asset scalingMichael Kolb2011-11-103-17/+40
* | | | | Merge "Fix the scale for complex script fonts and re-ajust y position."claireho2011-11-113-20/+45
|\ \ \ \ \
| * | | | | Fix the scale for complex script fonts and re-ajust y position.claireho2011-11-103-20/+45
* | | | | | am f5131505: Merge "Fallback mode when running out of textures for layers" in...Nicolas Roard2011-11-1119-99/+588
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge "Fallback mode when running out of textures for layers" into ics-mr1Nicolas Roard2011-11-1019-99/+588
| |\ \ \ \ \
| | * | | | | Fallback mode when running out of textures for layersNicolas Roard2011-11-1019-99/+588
* | | | | | | am bbffb087: Merge "Use anti-aliasing in prefetch tiles" into ics-mr1Chris Craik2011-11-111-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Use anti-aliasing in prefetch tiles" into ics-mr1Chris Craik2011-11-101-2/+2
| |\ \ \ \ \ \
| | * | | | | | Use anti-aliasing in prefetch tilesChris Craik2011-11-101-2/+2
| | | |_|_|/ / | | |/| | | |
* | | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-11-100-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-100-0/+0
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-090-0/+0
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-080-0/+0
| | | |\ \ \ \ \ \
* | | | \ \ \ \ \ \ am 1067d8e6: Merge "Fix CTS regressions from merge to r74534." into ics-mr1Ben Murdoch2011-11-101-2/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | / / / | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Merge "Fix CTS regressions from merge to r74534." into ics-mr1Ben Murdoch2011-11-101-2/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix CTS regressions from merge to r74534.Ben Murdoch2011-11-101-2/+0
| | |/ / / / / / /
* | | | | | | | | am 9074815a: Merge "Support pausing drawing" into ics-mr1John Reck2011-11-101-1/+11
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Support pausing drawing" into ics-mr1John Reck2011-11-101-1/+11
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Support pausing drawingJohn Reck2011-11-091-1/+11
| | | |/ / / / / / | | |/| | | | | |
* | | | | | | | | am 20f46fec: (-s ours) Merge "DO NOT MERGE Offset scroll area by the scroll o...George Mount2011-11-100-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "DO NOT MERGE Offset scroll area by the scroll origin on Android" into ...George Mount2011-11-103-11/+39
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | DO NOT MERGE Offset scroll area by the scroll origin on AndroidGeorge Mount2011-11-093-11/+39
| | | |_|_|/ / / | | |/| | | | |
* | | | | | | | Merge "Fix assertion message."George Mount2011-11-101-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix assertion message.George Mount2011-11-101-1/+2
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | resolved conflicts for merge of 5d8f08b9 to masterRussell Brenner2011-11-101-10/+15
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
generated by cgit v1.1 at 2024-07-06 09:05:46 +0000