| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | resolve merge conflicts of ed211b9 to lmp-mr1-dev-plus-aosp. | Chris Craik | 2014-12-10 | 4 | -8/+19 | |
| | |\ \ \ \ \ | | |/ / / / | ||||||
| | | * | | | | Fix frame-allocated path lifecycles | Chris Craik | 2014-12-10 | 4 | -8/+19 | |
| | | | |/ / | | |/| | | ||||||
| * | | | | | resolved conflicts for merge of 3bae94d7 to master | Nick Kralevich | 2014-12-10 | 1 | -2/+4 | |
| |\ \ \ \ \ | |/ / / / | ||||||
| | * | | | | resolved conflicts for merge of fe11126d to lmp-mr1-dev-plus-aosp | John Reck | 2014-12-09 | 1 | -4/+6 | |
| | |\ \ \ \ | | |/ / / | ||||||
| | | * | | | Merge "Teach AssetAtlas about more drawables" into lmp-mr1-dev | John Reck | 2014-12-09 | 1 | -2/+4 | |
| | | |\ \ \ | ||||||
| | | | * | | | Teach AssetAtlas about more drawables | John Reck | 2014-12-09 | 1 | -2/+4 | |
| | | | |/ / | ||||||
| * | | | | | am 1f78b336: am 497499b1: am 04c2bf4f: Merge "Remove unnecessary/erroneous re... | Derek Sollenberger | 2014-12-09 | 1 | -8/+0 | |
| |\ \ \ \ \ | |/ / / / | ||||||
| | * | | | | am 497499b1: am 04c2bf4f: Merge "Remove unnecessary/erroneous reference count... | Derek Sollenberger | 2014-12-09 | 1 | -8/+0 | |
| | |\ \ \ \ | | |/ / / | ||||||
| | | * | | | Remove unnecessary/erroneous reference counting | Derek Sollenberger | 2014-12-09 | 1 | -8/+0 | |
| | | |/ / | ||||||
| * | | | | am e97908d3: Merge commit \'0953ab27\' into manualmerge | Adam Lesinski | 2014-12-05 | 1 | -48/+57 | |
| |\ \ \ \ | |/ / / | ||||||
| | * | | | Merge commit '0953ab27' into manualmerge | Adam Lesinski | 2014-12-05 | 1 | -48/+57 | |
| | |\ \ \ | | |/ / | ||||||
| | | * | | Merge "AAPT: Move private attrs to new type for framework" into lmp-mr1-dev | Adam Lesinski | 2014-12-04 | 1 | -46/+57 | |
| | | |\ \ | ||||||
| | | | * | | AAPT: Move private attrs to new type for framework | Adam Lesinski | 2014-12-03 | 1 | -46/+57 | |
| * | | | | | resolved conflicts for merge of a75b0ad3 to master | John Reck | 2014-12-04 | 6 | -12/+13 | |
| |\ \ \ \ \ | |/ / / / | ||||||
| | * | | | | resolved conflicts for merge of a51a0901 to lmp-mr1-dev-plus-aosp | John Reck | 2014-12-04 | 6 | -12/+13 | |
| | |\ \ \ \ | | |/ / / | ||||||
| | | * | | | Resume RT-animations after a pauseSurface | John Reck | 2014-12-03 | 6 | -12/+13 | |
| | | |/ / | ||||||
| * | | | | am 8e5362f2: am 503071ae: am a2b5067a: Merge "RRO: prevent duplicate system o... | Adam Lesinski | 2014-12-04 | 1 | -0/+6 | |
| |\ \ \ \ | |/ / / | ||||||
| | * | | | am 503071ae: am a2b5067a: Merge "RRO: prevent duplicate system overlays" | Adam Lesinski | 2014-12-04 | 1 | -0/+6 | |
| | |\ \ \ | | | |/ | | |/| | ||||||
| | | * | | Merge "RRO: prevent duplicate system overlays" | Adam Lesinski | 2014-12-03 | 1 | -0/+6 | |
| | | |\ \ | ||||||
| | | | * | | RRO: prevent duplicate system overlays | Mårten Kongstad | 2014-11-07 | 1 | -0/+6 | |
| * | | | | | am 9438ad15: am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227c | Adam Lesinski | 2014-12-03 | 2 | -5/+9 | |
| |\ \ \ \ \ | |/ / / / | ||||||
| | * | | | | am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227c | Adam Lesinski | 2014-12-02 | 2 | -5/+9 | |
| | |\ \ \ \ | | |/ / / | ||||||
| | | * | | | Merge changes If2c7e09f,Ie21f227c | Adam Lesinski | 2014-12-02 | 2 | -5/+9 | |
| | | |\ \ \ | | | |/ / | ||||||
| | | | * | | RRO idmap: pad with 0xffffffff, not 0x00000000 | Mårten Kongstad | 2014-11-07 | 1 | -5/+5 | |
| | | | * | | RRO: reintroduce lost ResTable insert of assets | Mårten Kongstad | 2014-11-07 | 1 | -0/+4 | |
| * | | | | | am a22ab0da: am 9a04480e: am ef124887: Merge "Clip outline to View clip bound... | Chris Craik | 2014-12-02 | 1 | -4/+23 | |
| |\ \ \ \ \ | |/ / / / | ||||||
| | * | | | | am 9a04480e: am ef124887: Merge "Clip outline to View clip bounds for shadow ... | Chris Craik | 2014-12-02 | 1 | -4/+23 | |
| | |\ \ \ \ | | | |_|/ | | |/| | | ||||||
| | | * | | | Merge "Clip outline to View clip bounds for shadow computation" into lmp-mr1-dev | Chris Craik | 2014-12-02 | 1 | -4/+23 | |
| | | |\ \ \ | ||||||
| | | | * | | | Clip outline to View clip bounds for shadow computation | Chris Craik | 2014-12-01 | 1 | -4/+23 | |
| | | * | | | | Merge "Prevent calling GL functions with an invalid surface" into lmp-mr1-dev | John Reck | 2014-12-01 | 1 | -1/+1 | |
| | | |\ \ \ \ | ||||||
| | | | * | | | | Prevent calling GL functions with an invalid surface | Sangkyu Lee | 2014-12-01 | 1 | -1/+1 | |
| | | * | | | | | Merge "Enable stencil clipping within clearLayerRegions" into lmp-mr1-dev | Chris Craik | 2014-12-01 | 1 | -7/+1 | |
| | | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | ||||||
| | | | * | | | | Enable stencil clipping within clearLayerRegions | Dohyun Lee | 2014-11-26 | 1 | -7/+1 | |
| * | | | | | | | am d7af6eaa: am d51205fd: am 6afc5cf3: Merge "Prevent calling GL functions wi... | John Reck | 2014-12-01 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| | * | | | | | | am d51205fd: am 6afc5cf3: Merge "Prevent calling GL functions with an invalid... | John Reck | 2014-12-01 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | ||||||
| | | * | | | | | Merge "Prevent calling GL functions with an invalid surface" | John Reck | 2014-12-01 | 1 | -1/+1 | |
| | | |\ \ \ \ \ | ||||||
| | | | * | | | | | Prevent calling GL functions with an invalid surface | Sangkyu Lee | 2014-11-26 | 1 | -1/+1 | |
| * | | | | | | | | am e986817a: am 6eac26a4: am ca84c8b1: Merge "Revert "Force-use the pbuffer s... | Chris Craik | 2014-11-26 | 1 | -2/+1 | |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| | * | | | | | | | am 6eac26a4: am ca84c8b1: Merge "Revert "Force-use the pbuffer surface for de... | Chris Craik | 2014-11-26 | 1 | -2/+1 | |
| | |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | ||||||
| | | * | | | | | | Merge "Revert "Force-use the pbuffer surface for destroy"" into lmp-mr1-dev | Chris Craik | 2014-11-26 | 1 | -2/+1 | |
| | | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | ||||||
| | | | * | | | | | Revert "Force-use the pbuffer surface for destroy" | Chris Craik | 2014-11-26 | 1 | -2/+1 | |
| * | | | | | | | | am 0d4ab958: am 4e3404d9: am dec3f138: Merge "Force-use the pbuffer surface f... | John Reck | 2014-11-26 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| | * | | | | | | | am 4e3404d9: am dec3f138: Merge "Force-use the pbuffer surface for destroy" i... | John Reck | 2014-11-26 | 1 | -1/+2 | |
| | |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | | * | | | | | | Merge "Force-use the pbuffer surface for destroy" into lmp-mr1-dev | John Reck | 2014-11-25 | 1 | -1/+2 | |
| | | |\ \ \ \ \ \ | | | |/ / / / / | ||||||
| | | | * | | | | | Force-use the pbuffer surface for destroy | John Reck | 2014-11-25 | 1 | -1/+2 | |
| * | | | | | | | | am 1fb141f8: am 9c5b7b09: am ee660651: Merge "Improve DisplayList state outpu... | Chris Craik | 2014-11-26 | 3 | -3/+7 | |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| | * | | | | | | | am 9c5b7b09: am ee660651: Merge "Improve DisplayList state output" into lmp-m... | Chris Craik | 2014-11-26 | 3 | -3/+7 | |
| | |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | | * | | | | | | Merge "Improve DisplayList state output" into lmp-mr1-dev | Chris Craik | 2014-11-25 | 3 | -3/+7 | |
| | | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | ||||||
| | | | * | | | | | Improve DisplayList state output | Chris Craik | 2014-11-21 | 3 | -3/+7 | |
| | | | | |_|/ / | | | |/| | | | ||||||
| * | | | | | | | am ab1a53c5: am bf62d307: am af5bd75b: Merge "Enable stencil clipping within ... | Chris Craik | 2014-11-26 | 1 | -7/+1 | |
| |\ \ \ \ \ \ \ | |/ / / / / / | ||||||
 |
index : frameworks_base.git | |
| frameworks/base | git repository hosting |
| summaryrefslogtreecommitdiffstats |