summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | | | | | Fix a browser crash related to HTML5 video.Teng-Hui Zhu2012-05-251-9/+0
* | | | | | | | | | | am a0993e9d: am 9f135757: Merge "Copy scroll position for scrolling layer" in...John Reck2012-05-251-21/+15
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 9f135757: Merge "Copy scroll position for scrolling layer" into jb-devJohn Reck2012-05-251-21/+15
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge "Copy scroll position for scrolling layer" into jb-devJohn Reck2012-05-251-21/+15
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Copy scroll position for scrolling layerJohn Reck2012-05-251-21/+15
* | | | | | | | | | | | am 70752fce: am 38ea37b8: Merge "Use newest available SurfaceBacking scale wh...Chris Craik2012-05-251-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 38ea37b8: Merge "Use newest available SurfaceBacking scale when counting t...Chris Craik2012-05-251-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge "Use newest available SurfaceBacking scale when counting texture usage"...Chris Craik2012-05-251-2/+2
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Use newest available SurfaceBacking scale when counting texture usageChris Craik2012-05-251-2/+2
| | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | |
* | | | | | | | | | | | am e8a7affb: am 2cb64bfb: Merge "Better support for HTML5 audio loop" into jb...Teng-Hui Zhu2012-05-252-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 2cb64bfb: Merge "Better support for HTML5 audio loop" into jb-devTeng-Hui Zhu2012-05-252-0/+16
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge "Better support for HTML5 audio loop" into jb-devTeng-Hui Zhu2012-05-252-0/+16
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Better support for HTML5 audio loopTeng-Hui Zhu2012-05-242-0/+16
* | | | | | | | | | | | am 45484edf: am 385ef015: Merge "Compute draw transforms only for new/dynamic...Chris Craik2012-05-255-43/+63
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | / / / / / / | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | am 385ef015: Merge "Compute draw transforms only for new/dynamically transfor...Chris Craik2012-05-255-43/+63
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge "Compute draw transforms only for new/dynamically transformed layers" i...Chris Craik2012-05-255-43/+63
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Compute draw transforms only for new/dynamically transformed layersChris Craik2012-05-245-43/+63
* | | | | | | | | | | am 06d698b1: am 917ab176: Support content detection metatagsJohn Reck2012-05-246-2/+49
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 917ab176: Support content detection metatagsJohn Reck2012-05-246-2/+49
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Support content detection metatagsJohn Reck2012-05-246-2/+49
* | | | | | | | | | | am 8959907b: am 91f41286: Support skipping a touch stream due to lack of hand...John Reck2012-05-249-7/+60
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 91f41286: Support skipping a touch stream due to lack of handlersJohn Reck2012-05-249-7/+60
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Support skipping a touch stream due to lack of handlersJohn Reck2012-05-249-7/+60
| | | |_|/ / / / / / | | |/| | | | | | |
* | | | | | | | | | am fa4bf4e2: am e5d2bf33: Merge "Fix memory leak" into jb-devNicolas Roard2012-05-241-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am e5d2bf33: Merge "Fix memory leak" into jb-devNicolas Roard2012-05-241-2/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "Fix memory leak" into jb-devNicolas Roard2012-05-241-2/+2
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fix memory leakNicolas Roard2012-05-241-2/+2
| | | |/ / / / / / /
* | | | | | | | | | am 858defca: am ac4c6f05: Merge "Fix global buffer overlow error reported by ...Selim Gurun2012-05-241-0/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am ac4c6f05: Merge "Fix global buffer overlow error reported by ASAN" into jb...Selim Gurun2012-05-241-0/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "Fix global buffer overlow error reported by ASAN" into jb-devSelim Gurun2012-05-241-0/+1
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | Fix global buffer overlow error reported by ASANSelim Gurun2012-05-241-0/+1
* | | | | | | | | | Merge "Modify makefile for building for ASAN"Selim Gurun2012-05-241-0/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Modify makefile for building for ASANSelim Gurun2012-05-241-0/+11
* | | | | | | | | | | am fe5bfa1b: am 9c52999f: Merge "Move scrollOffset into Layer class" into jb-devChris Craik2012-05-246-13/+15
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | 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 284e9fee: am c8d518ba: Merge "properly convert data from utf-16 to utf-8 i...Victoria Lease2012-05-241-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | / / / / / / / / | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | 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
| | | |/ / / / / / / /
* | | | | | | | | | | am f285f8be: Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-240-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| | | | | | | | | | |
| | \ \ \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ \ \ 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 9bada0c1: am 39ba1a3a: Merge "Don\'t send selection info to WebView for un...George Mount2012-05-241-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |