Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | | Merge "Null check" into jb-dev | John Reck | 2012-05-22 | 1 | -2/+3 | |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | ||||||
| | | * | | | | | | Null check | John Reck | 2012-05-21 | 1 | -2/+3 | |
* | | | | | | | | | Remove the hacks used to suspend and resume the non-client-based Geolocation ... | Steve Block | 2012-05-22 | 6 | -37/+0 | |
* | | | | | | | | | Hook up client-based Geolocation mock | Steve Block | 2012-05-22 | 4 | -32/+91 | |
* | | | | | | | | | Always call back to new Geolocation requests | Steve Block | 2012-05-22 | 3 | -3/+32 | |
* | | | | | | | | | Switch to client-based Geolocation | Steve Block | 2012-05-22 | 18 | -373/+645 | |
* | | | | | | | | | am f282a4d1: am 37289e42: Merge "Disable transform fudging for merged surface... | Chris Craik | 2012-05-21 | 2 | -1/+8 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | am 37289e42: Merge "Disable transform fudging for merged surfaces" into jb-dev | Chris Craik | 2012-05-21 | 2 | -1/+8 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | ||||||
| | * | | | | | | | Merge "Disable transform fudging for merged surfaces" into jb-dev | Chris Craik | 2012-05-21 | 2 | -1/+8 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | Disable transform fudging for merged surfaces | Chris Craik | 2012-05-21 | 2 | -1/+8 | |
| | | | |/ / / / / | | | |/| | | | | | ||||||
* | | | | | | | | | am 13c0becf: am db197e8d: Merge "Real isn\'t real according to the USPS, but ... | John Reck | 2012-05-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | am db197e8d: Merge "Real isn\'t real according to the USPS, but add it anyway... | John Reck | 2012-05-21 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | ||||||
| | * | | | | | | | Merge "Real isn't real according to the USPS, but add it anyway" into jb-dev | John Reck | 2012-05-21 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | Real isn't real according to the USPS, but add it anyway | John Reck | 2012-05-21 | 1 | -1/+1 | |
| | | | |/ / / / / | | | |/| | | | | | ||||||
* | | | | | | | | | am 8a1bb3c8: (-s ours) am 8084d1f1: Merge "Turn off autohinting at HDPI. do n... | Billy Hewlett | 2012-05-21 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | am 8084d1f1: Merge "Turn off autohinting at HDPI. do not merge" into jb-dev | Billy Hewlett | 2012-05-21 | 1 | -0/+4 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | ||||||
| | * | | | | | | | Merge "Turn off autohinting at HDPI. do not merge" into jb-dev | Billy Hewlett | 2012-05-21 | 1 | -0/+4 | |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | ||||||
| | | * | | | | | | Turn off autohinting at HDPI. do not merge | Billy Hewlett | 2012-05-21 | 1 | -0/+4 | |
| | | |/ / / / / | ||||||
* | | | | | | | | am 655f75fe: am 2c52cc31: Merge "Switch to a 4ms/1s timer" into jb-dev | John Reck | 2012-05-21 | 3 | -4/+10 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | am 2c52cc31: Merge "Switch to a 4ms/1s timer" into jb-dev | John Reck | 2012-05-21 | 3 | -4/+10 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | * | | | | | | Merge "Switch to a 4ms/1s timer" into jb-dev | John Reck | 2012-05-21 | 3 | -4/+10 | |
| | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | Switch to a 4ms/1s timer | John Reck | 2012-05-18 | 3 | -4/+10 | |
* | | | | | | | | | am 0e518116: am 261f8950: Add checks for null base layer content | Chris Craik | 2012-05-21 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | am 261f8950: Add checks for null base layer content | Chris Craik | 2012-05-21 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | ||||||
| | * | | | | | | | Add checks for null base layer content | Chris Craik | 2012-05-21 | 1 | -2/+2 | |
| | | |/ / / / / | | |/| | | | | | ||||||
* | | | | | | | | am 0fec4094: am 6baa213e: Fix memory leak and repaint issues with fixed backg... | Nicolas Roard | 2012-05-21 | 5 | -17/+29 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | am 6baa213e: Fix memory leak and repaint issues with fixed background elements | Nicolas Roard | 2012-05-18 | 5 | -17/+29 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | * | | | | | | Fix memory leak and repaint issues with fixed background elements | Nicolas Roard | 2012-05-18 | 5 | -17/+29 | |
* | | | | | | | | am 82ea97e5: Reconcile with jb-release nakasi-factoryrom-release | The Android Open Source Project | 2012-05-21 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| | | | | | | | | ||||||
| | \ \ \ \ \ \ | ||||||
| *-. \ \ \ \ \ \ | Reconcile with jb-release nakasi-factoryrom-release | The Android Open Source Project | 2012-05-18 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | / / / | | | | |_|/ / / | | | |/| | | | | ||||||
| | | * | | | | | merge in nakasi-factoryrom-release history after reset to jb-dev | The Android Automerger | 2012-05-18 | 0 | -0/+0 | |
| | | |\ \ \ \ \ | | |/ / / / / / | ||||||
| | * | | | | | | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-05-17 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | Revert "Allow more layers to be merged." | Chris Craik | 2012-05-16 | 4 | -15/+19 | |
* | | | | | | | | | am 80e066f5: am 8156b667: Merge "Revert part of "Fix iframe, ..."" into jb-dev | Mangesh Ghiware | 2012-05-21 | 5 | -1/+87 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | am 8156b667: Merge "Revert part of "Fix iframe, ..."" into jb-dev | Mangesh Ghiware | 2012-05-18 | 5 | -1/+87 | |
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | ||||||
| | * | | | | | | | Merge "Revert part of "Fix iframe, ..."" into jb-dev | Mangesh Ghiware | 2012-05-18 | 5 | -1/+87 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | Revert part of "Fix iframe, ..." | Mangesh Ghiware | 2012-05-18 | 5 | -1/+87 | |
* | | | | | | | | | | am 6718ce8a: am 48605bf1: Remove paint tile operations for stale painters | Chris Craik | 2012-05-21 | 7 | -2/+46 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | ||||||
| * | | | | | | | | | am 48605bf1: Remove paint tile operations for stale painters | Chris Craik | 2012-05-18 | 7 | -2/+46 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | ||||||
| | * | | | | | | | | Remove paint tile operations for stale painters | Chris Craik | 2012-05-18 | 7 | -2/+46 | |
* | | | | | | | | | | am e6dd6940: am d4239885: Merge "Cherrypick WebKit r94543." into jb-dev | Victoria Lease | 2012-05-21 | 8 | -5/+52 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | ||||||
| * | | | | | | | | | am d4239885: Merge "Cherrypick WebKit r94543." into jb-dev | Victoria Lease | 2012-05-18 | 8 | -5/+52 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | ||||||
| | * | | | | | | | | Merge "Cherrypick WebKit r94543." into jb-dev | Victoria Lease | 2012-05-18 | 8 | -5/+52 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | Cherrypick WebKit r94543. | Victoria Lease | 2012-05-18 | 8 | -5/+52 | |
* | | | | | | | | | | | am 035ccee8: am 17a19ec1: Merge "Clean up some redundant code" into jb-dev | Teng-Hui Zhu | 2012-05-21 | 2 | -6/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | am 17a19ec1: Merge "Clean up some redundant code" into jb-dev | Teng-Hui Zhu | 2012-05-18 | 2 | -6/+2 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | * | | | | | | | | | Merge "Clean up some redundant code" into jb-dev | Teng-Hui Zhu | 2012-05-18 | 2 | -6/+2 | |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | | | ||||||
| | | * | | | | | | | | Clean up some redundant code | Teng-Hui Zhu | 2012-05-17 | 2 | -6/+2 | |
* | | | | | | | | | | | am fd569800: am 1e59a334: Make sure CanvasLayer isn\'t merged and is initiali... | John Reck | 2012-05-21 | 3 | -1/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | am 1e59a334: Make sure CanvasLayer isn\'t merged and is initialized correctly | John Reck | 2012-05-17 | 3 | -1/+4 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / |