Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | Fix global buffer overlow error reported by ASAN | Selim Gurun | 2012-05-24 | 1 | -0/+1 | |
* | | | | | | | am 9c52999f: Merge "Move scrollOffset into Layer class" into jb-dev | Chris Craik | 2012-05-24 | 6 | -13/+15 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Merge "Move scrollOffset into Layer class" into jb-dev | Chris Craik | 2012-05-24 | 6 | -13/+15 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Move scrollOffset into Layer class | Chris Craik | 2012-05-23 | 6 | -13/+15 | |
* | | | | | | | | am c8d518ba: Merge "properly convert data from utf-16 to utf-8 in LoadData()"... | Victoria Lease | 2012-05-24 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | Merge "properly convert data from utf-16 to utf-8 in LoadData()" into jb-dev | Victoria Lease | 2012-05-24 | 1 | -3/+3 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | properly convert data from utf-16 to utf-8 in LoadData() | Victoria Lease | 2012-05-24 | 1 | -3/+3 | |
| | |/ / / / / / | ||||||
| | | | | | | | | ||||||
| \ \ \ \ \ \ \ | ||||||
*-. \ \ \ \ \ \ \ | Reconcile with jb-release nakasi-factoryrom-release | The Android Open Source Project | 2012-05-24 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | / | | | |_|_|_|_|/ | | |/| | | | | | ||||||
| | * | | | | | | merge in nakasi-factoryrom-release history after reset to jb-dev | The Android Automerger | 2012-05-22 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ | ||||||
| * | \ \ \ \ \ \ | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-05-24 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | ||||||
| | * | | | | | | | Fix crash | Nicolas Roard | 2012-05-23 | 1 | -0/+2 | |
| | * | | | | | | | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-05-23 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | ||||||
* | | | | | | | | | am 39ba1a3a: Merge "Don\'t send selection info to WebView for unrendered sele... | George Mount | 2012-05-24 | 1 | -1/+5 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | ||||||
| * | | | | | | | | Merge "Don't send selection info to WebView for unrendered selections." into ... | George Mount | 2012-05-24 | 1 | -1/+5 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | ||||||
| | * | | | | | | | Don't send selection info to WebView for unrendered selections. | George Mount | 2012-05-23 | 1 | -1/+5 | |
* | | | | | | | | | am 6f4fd96b: Merge "Don\'t set up background images if 1x1" into jb-dev | Nicolas Roard | 2012-05-23 | 2 | -6/+12 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | Merge "Don't set up background images if 1x1" into jb-dev | Nicolas Roard | 2012-05-23 | 2 | -6/+12 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Don't set up background images if 1x1 | Nicolas Roard | 2012-05-23 | 2 | -6/+12 | |
| | |/ / / / / / / | ||||||
* | | | | | | | | | am 596f7241: Merge "Use Surface areas to compute tile usage" into jb-dev | Chris Craik | 2012-05-23 | 5 | -20/+30 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | Merge "Use Surface areas to compute tile usage" into jb-dev | Chris Craik | 2012-05-23 | 5 | -20/+30 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Use Surface areas to compute tile usage | Chris Craik | 2012-05-23 | 5 | -20/+30 | |
| | | |/ / / / / / | | |/| | | | | | | ||||||
* | | | | | | | | | am 21ed283c: Merge "Add tracing to interesting/potentially costly functions" ... | Chris Craik | 2012-05-23 | 3 | -0/+5 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | Merge "Add tracing to interesting/potentially costly functions" into jb-dev | Chris Craik | 2012-05-23 | 3 | -0/+5 | |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | ||||||
| | * | | | | | | | Add tracing to interesting/potentially costly functions | Chris Craik | 2012-05-23 | 3 | -0/+5 | |
| | |/ / / / / / | ||||||
* | | | | | | | | am 17f16d58: Merge "Clean up the transferQueue code and add more detailed GL ... | Teng-Hui Zhu | 2012-05-23 | 2 | -55/+11 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | Merge "Clean up the transferQueue code and add more detailed GL log" into jb-dev | Teng-Hui Zhu | 2012-05-23 | 2 | -55/+11 | |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | / | | | |_|_|_|/ | | |/| | | | | ||||||
| | * | | | | | Clean up the transferQueue code and add more detailed GL log | Teng-Hui Zhu | 2012-05-23 | 2 | -55/+11 | |
* | | | | | | | am a6645da2: Merge "Correctly handle the EGL context recreation." into jb-dev | Teng-Hui Zhu | 2012-05-23 | 2 | -24/+21 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Merge "Correctly handle the EGL context recreation." into jb-dev | Teng-Hui Zhu | 2012-05-23 | 2 | -24/+21 | |
| |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | * | | | | | Correctly handle the EGL context recreation. | Teng-Hui Zhu | 2012-05-23 | 2 | -24/+21 | |
* | | | | | | | am 7f33cb9c: Merge "Fix crash" into jb-dev | Nicolas Roard | 2012-05-23 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Merge "Fix crash" into jb-dev | Nicolas Roard | 2012-05-23 | 1 | -0/+2 | |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | ||||||
| | * | | | | | Fix crash | Nicolas Roard | 2012-05-23 | 1 | -0/+2 | |
* | | | | | | | am 55d60259: Merge "Don\'t use an ImageBuffer for scratchContext()" into jb-dev | John Reck | 2012-05-22 | 2 | -1/+21 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Merge "Don't use an ImageBuffer for scratchContext()" into jb-dev | John Reck | 2012-05-22 | 2 | -1/+21 | |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| | * | | | | | Don't use an ImageBuffer for scratchContext() | John Reck | 2012-05-22 | 2 | -1/+21 | |
* | | | | | | | am 56ec1c56: Merge "We need to clear the items even when seeing obsolete tile... | Teng-Hui Zhu | 2012-05-22 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Merge "We need to clear the items even when seeing obsolete tiles" into jb-dev | Teng-Hui Zhu | 2012-05-22 | 1 | -0/+1 | |
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / / | ||||||
| | * | | | | We need to clear the items even when seeing obsolete tiles | Teng-Hui Zhu | 2012-05-22 | 1 | -0/+1 | |
* | | | | | | am 45aaa37e: Merge "Handle more favicon decoding error cases" into jb-dev | John Reck | 2012-05-22 | 4 | -15/+25 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | Merge "Handle more favicon decoding error cases" into jb-dev | John Reck | 2012-05-22 | 4 | -15/+25 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Handle more favicon decoding error cases | John Reck | 2012-05-22 | 4 | -15/+25 | |
| | |/ / / / | ||||||
* | | | | | | Reconcile with jb-release | The Android Open Source Project | 2012-05-22 | 0 | -0/+0 | |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | ||||||
| * | | | | | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-05-22 | 0 | -0/+0 | |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | ||||||
| | * | | | | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-05-20 | 0 | -0/+0 | |
| | |\ \ \ \ | ||||||
* | | \ \ \ \ | am c8d9e14b: DO NOT MERGE Consider fixed layers when scrolling the edit box. | George Mount | 2012-05-22 | 1 | -0/+90 | |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | ||||||
| * | | | | | | DO NOT MERGE Consider fixed layers when scrolling the edit box. | George Mount | 2012-05-22 | 1 | -0/+90 | |
| | |_|_|/ / | |/| | | | | ||||||
* | | | | | | am fa25b832: Merge "Null check" into jb-dev | John Reck | 2012-05-22 | 1 | -2/+3 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | Merge "Null check" into jb-dev | John Reck | 2012-05-22 | 1 | -2/+3 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| | * | | | | Null check | John Reck | 2012-05-21 | 1 | -2/+3 |