Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-29 | 0 | -0/+0 |
|\ | |||||
| * | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-28 | 0 | -0/+0 |
| |\ | |||||
| | * | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-27 | 0 | -0/+0 |
| | |\ | |||||
| | | * | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-21 | 0 | -0/+0 |
| | | |\ | |||||
| | | | * | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-20 | 0 | -0/+0 |
| | | | |\ | |||||
| | | | | * | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-16 | 0 | -0/+0 |
| | | | | |\ | |||||
| | | | | | * | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-15 | 0 | -0/+0 |
| | | | | | |\ | |||||
| | | | | | | * | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-14 | 0 | -0/+0 |
| | | | | | | |\ | |||||
| | | | | | | | * | Null check | John Reck | 2012-08-13 | 1 | -1/+1 |
| | | | | | | | * | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-13 | 0 | -0/+0 |
| | | | | | | | |\ | |||||
| | | | | | | | | * | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-09 | 0 | -0/+0 |
| | | | | | | | | |\ | |||||
| | | | | | | | | | * | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-08 | 0 | -0/+0 |
| | | | | | | | | | |\ | |||||
| | | | | | | | | | | * | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-07 | 0 | -0/+0 |
| | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | * | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-06 | 0 | -0/+0 |
| | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | * | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-02 | 0 | -0/+0 |
| | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | * | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-07-31 | 0 | -0/+0 |
| | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | * | am 4045ec3b: am a49c3d24: Reconcile with jb-mr0-release | The Android Open Source Project | 2012-07-27 | 0 | -0/+0 |
| | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | * \ | am 62c46b3a: (-s ours) Merge "DO NOT MERGE Push everything into an R-Tree" in... | John Reck | 2012-07-27 | 0 | -0/+0 |
| | | | | | | | | | | | | | | |\ \ | |||||
| | | | | | | | | | | | | | | * \ \ | am b7c99a42: Fix background tiles drawing | Chris Craik | 2012-07-27 | 2 | -3/+5 |
| | | | | | | | | | | | | | | |\ \ \ | |||||
| | | | | | | | | | | | | | | * | | | | Push everything into an R-Tree | John Reck | 2012-07-26 | 10 | -541/+233 |
* | | | | | | | | | | | | | | | | | | | am f2b8b88d: am 51619153: Merge "Fix memory leak caused by CSSRuleList wrapper" | Jean-Baptiste Queru | 2012-08-28 | 16 | -38/+50 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | am 51619153: Merge "Fix memory leak caused by CSSRuleList wrapper" | Jean-Baptiste Queru | 2012-08-28 | 16 | -38/+50 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "Fix memory leak caused by CSSRuleList wrapper" | Jean-Baptiste Queru | 2012-08-28 | 16 | -38/+50 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | | | | Fix memory leak caused by CSSRuleList wrapper | xqian6 | 2012-08-24 | 16 | -38/+50 |
| | |/ / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | | Merge "Use new surface flinger API." into jb-mr1-dev | Jeff Brown | 2012-08-27 | 1 | -2/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | Use new surface flinger API. | Jeff Brown | 2012-08-24 | 1 | -2/+9 |
| | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | Merge "Text around selection falls back to caret rect when not in text." into... | George Mount | 2012-08-27 | 2 | -4/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | Text around selection falls back to caret rect when not in text. | George Mount | 2012-08-23 | 2 | -4/+5 |
| | |_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | Don't track the opaque area of small drawing operations | Chris Craik | 2012-08-24 | 1 | -1/+4 |
| |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | Only use the clipping painter when painting to a bitmap. | Chris Craik | 2012-08-23 | 1 | -18/+24 |
|/ / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | Merge "Exit fast tile swap mode immediately upon SurfaceCollection swap" into... | Chris Craik | 2012-08-20 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | Exit fast tile swap mode immediately upon SurfaceCollection swap | Chris Craik | 2012-08-20 | 1 | -0/+1 |
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | Merge "DO NOT MERGE Text locale compatibility shim" into jb-mr1-dev | Victoria Lease | 2012-08-20 | 3 | -91/+142 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | DO NOT MERGE Text locale compatibility shim | Billy Hewlett | 2012-08-20 | 3 | -91/+142 |
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | Fix opaque operation area calculation | Chris Craik | 2012-08-20 | 2 | -18/+25 |
|/ / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | Merge "Support partial invals on layers" into jb-mr1-dev | John Reck | 2012-08-17 | 4 | -59/+39 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | Support partial invals on layers | John Reck | 2012-08-17 | 4 | -59/+39 |
* | | | | | | | | | | | | | | | | | | Merge "Early return from layer painting when fully clipped" into jb-mr1-dev | Chris Craik | 2012-08-17 | 1 | -7/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Early return from layer painting when fully clipped | Chris Craik | 2012-08-16 | 1 | -7/+8 |
| |/ / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | am e750fbf4: am b74a9cf2: Merge "host modules don\'t need LOCAL_MODULE_TAGS" | Joe Onorato | 2012-08-17 | 1 | -2/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | am b74a9cf2: Merge "host modules don\'t need LOCAL_MODULE_TAGS" | Joe Onorato | 2012-08-16 | 1 | -2/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Merge "host modules don't need LOCAL_MODULE_TAGS" | Joe Onorato | 2012-08-16 | 1 | -2/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | host modules don't need LOCAL_MODULE_TAGS | Joe Onorato | 2012-08-15 | 1 | -2/+0 |
| | |/ / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | Merge "Fix SIGBUG due to misalignment" into jb-mr1-dev | John Reck | 2012-08-16 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | Fix SIGBUG due to misalignment | John Reck | 2012-08-16 | 1 | -3/+3 |
* | | | | | | | | | | | | | | | | | | am f314e0fc: (-s ours) Reconcile with jb-mr0-release - do not merge | The Android Open Source Project | 2012-08-16 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | Reconcile with jb-mr0-release - do not merge | The Android Open Source Project | 2012-08-16 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge in jb-mr0-release history after reset to jb-dev | The Android Automerger | 2012-08-16 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "Increase max texture count to accommodate large screens" into jb-mr1-dev | Chris Craik | 2012-08-16 | 1 | -5/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | Increase max texture count to accommodate large screens | Chris Craik | 2012-08-16 | 1 | -5/+5 |
| | |_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |