summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | Fix global buffer overlow error reported by ASANSelim Gurun2012-05-241-0/+1
* | | | | | | am 9c52999f: Merge "Move scrollOffset into Layer class" into jb-devChris Craik2012-05-246-13/+15
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Move scrollOffset into Layer class" into jb-devChris Craik2012-05-246-13/+15
| |\ \ \ \ \ \
| | * | | | | | Move scrollOffset into Layer classChris Craik2012-05-236-13/+15
* | | | | | | | am c8d518ba: Merge "properly convert data from utf-16 to utf-8 in LoadData()"...Victoria Lease2012-05-241-3/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "properly convert data from utf-16 to utf-8 in LoadData()" into jb-devVictoria Lease2012-05-241-3/+3
| |\ \ \ \ \ \ \
| | * | | | | | | properly convert data from utf-16 to utf-8 in LoadData()Victoria Lease2012-05-241-3/+3
| | |/ / / / / /
| | | | | | | |
| \ \ \ \ \ \ \
*-. \ \ \ \ \ \ \ Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-240-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | / | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | merge in nakasi-factoryrom-release history after reset to jb-devThe Android Automerger2012-05-220-0/+0
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-240-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Fix crashNicolas Roard2012-05-231-0/+2
| | * | | | | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-230-0/+0
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
* | | | | | | | | am 39ba1a3a: Merge "Don\'t send selection info to WebView for unrendered sele...George Mount2012-05-241-1/+5
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Merge "Don't send selection info to WebView for unrendered selections." into ...George Mount2012-05-241-1/+5
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Don't send selection info to WebView for unrendered selections.George Mount2012-05-231-1/+5
* | | | | | | | | am 6f4fd96b: Merge "Don\'t set up background images if 1x1" into jb-devNicolas Roard2012-05-232-6/+12
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Don't set up background images if 1x1" into jb-devNicolas Roard2012-05-232-6/+12
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Don't set up background images if 1x1Nicolas Roard2012-05-232-6/+12
| | |/ / / / / / /
* | | | | | | | | am 596f7241: Merge "Use Surface areas to compute tile usage" into jb-devChris Craik2012-05-235-20/+30
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Use Surface areas to compute tile usage" into jb-devChris Craik2012-05-235-20/+30
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Use Surface areas to compute tile usageChris Craik2012-05-235-20/+30
| | | |/ / / / / / | | |/| | | | | |
* | | | | | | | | am 21ed283c: Merge "Add tracing to interesting/potentially costly functions" ...Chris Craik2012-05-233-0/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Add tracing to interesting/potentially costly functions" into jb-devChris Craik2012-05-233-0/+5
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| | * | | | | | | Add tracing to interesting/potentially costly functionsChris Craik2012-05-233-0/+5
| | |/ / / / / /
* | | | | | | | am 17f16d58: Merge "Clean up the transferQueue code and add more detailed GL ...Teng-Hui Zhu2012-05-232-55/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Clean up the transferQueue code and add more detailed GL log" into jb-devTeng-Hui Zhu2012-05-232-55/+11
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | / | | | |_|_|_|/ | | |/| | | |
| | * | | | | Clean up the transferQueue code and add more detailed GL logTeng-Hui Zhu2012-05-232-55/+11
* | | | | | | am a6645da2: Merge "Correctly handle the EGL context recreation." into jb-devTeng-Hui Zhu2012-05-232-24/+21
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Correctly handle the EGL context recreation." into jb-devTeng-Hui Zhu2012-05-232-24/+21
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Correctly handle the EGL context recreation.Teng-Hui Zhu2012-05-232-24/+21
* | | | | | | am 7f33cb9c: Merge "Fix crash" into jb-devNicolas Roard2012-05-231-0/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Fix crash" into jb-devNicolas Roard2012-05-231-0/+2
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Fix crashNicolas Roard2012-05-231-0/+2
* | | | | | | am 55d60259: Merge "Don\'t use an ImageBuffer for scratchContext()" into jb-devJohn Reck2012-05-222-1/+21
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Don't use an ImageBuffer for scratchContext()" into jb-devJohn Reck2012-05-222-1/+21
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Don't use an ImageBuffer for scratchContext()John Reck2012-05-222-1/+21
* | | | | | | am 56ec1c56: Merge "We need to clear the items even when seeing obsolete tile...Teng-Hui Zhu2012-05-221-0/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "We need to clear the items even when seeing obsolete tiles" into jb-devTeng-Hui Zhu2012-05-221-0/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / /
| | * | | | We need to clear the items even when seeing obsolete tilesTeng-Hui Zhu2012-05-221-0/+1
* | | | | | am 45aaa37e: Merge "Handle more favicon decoding error cases" into jb-devJohn Reck2012-05-224-15/+25
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Handle more favicon decoding error cases" into jb-devJohn Reck2012-05-224-15/+25
| |\ \ \ \ \
| | * | | | | Handle more favicon decoding error casesJohn Reck2012-05-224-15/+25
| | |/ / / /
* | | | | | Reconcile with jb-releaseThe Android Open Source Project2012-05-220-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-220-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-200-0/+0
| | |\ \ \ \
* | | \ \ \ \ am c8d9e14b: DO NOT MERGE Consider fixed layers when scrolling the edit box.George Mount2012-05-221-0/+90
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | DO NOT MERGE Consider fixed layers when scrolling the edit box.George Mount2012-05-221-0/+90
| | |_|_|/ / | |/| | | |
* | | | | | am fa25b832: Merge "Null check" into jb-devJohn Reck2012-05-221-2/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Null check" into jb-devJohn Reck2012-05-221-2/+3
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Null checkJohn Reck2012-05-211-2/+3