summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am db590796: Merge "Minimize tearing for fixed element in single surface mode...Teng-Hui Zhu2012-05-306-12/+28
|\
| * Merge "Minimize tearing for fixed element in single surface mode" into jb-devTeng-Hui Zhu2012-05-306-12/+28
| |\
| | * Minimize tearing for fixed element in single surface modeTeng-Hui Zhu2012-05-306-12/+28
* | | am e4d0c197: Merge "Draw entire layer tree in capturePicture()" into jb-devChris Craik2012-05-302-2/+11
|\ \ \ | |/ /
| * | Merge "Draw entire layer tree in capturePicture()" into jb-devChris Craik2012-05-302-2/+11
| |\ \
| | * | Draw entire layer tree in capturePicture()Chris Craik2012-05-302-2/+11
| | |/
* | | Reconcile with jb-releaseThe Android Open Source Project2012-05-300-0/+0
|\ \ \
| * \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-300-0/+0
| |\ \ \
* | \ \ \ am 658c3ec9: Merge "Consider frame offset for text snap rectangle." into jb-devGeorge Mount2012-05-302-19/+13
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge "Consider frame offset for text snap rectangle." into jb-devGeorge Mount2012-05-302-19/+13
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Consider frame offset for text snap rectangle.George Mount2012-05-292-19/+13
| | | |/ | | |/|
* | | | am 4a0b0816: Merge "Don\'t use setupPaintFill for drawBitmap" into jb-devJohn Reck2012-05-293-2/+15
|\ \ \ \ | |/ / /
| * | | Merge "Don't use setupPaintFill for drawBitmap" into jb-devJohn Reck2012-05-293-2/+15
| |\ \ \
| | * | | Don't use setupPaintFill for drawBitmapJohn Reck2012-05-293-2/+15
| | |/ /
* | | | am 86c18a99: Fix for wrong positioningNicolas Roard2012-05-291-1/+1
|\ \ \ \ | |/ / /
| * | | Fix for wrong positioningNicolas Roard2012-05-291-1/+1
* | | | am bc9eaa14: Merge "Reduce UI-thread computation" into jb-devChris Craik2012-05-297-40/+24
|\ \ \ \ | |/ / /
| * | | Merge "Reduce UI-thread computation" into jb-devChris Craik2012-05-297-40/+24
| |\ \ \
| | * | | Reduce UI-thread computationChris Craik2012-05-257-40/+24
* | | | | am 6184a1df: Disable copyScrollPosition for iframesJohn Reck2012-05-291-0/+3
|\ \ \ \ \ | |/ / / /
| * | | | Disable copyScrollPosition for iframesJohn Reck2012-05-291-0/+3
| | |/ / | |/| |
| | | |
| \ \ \
*-. \ \ \ Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-290-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| | * | | merge in nakasi-factoryrom-release history after reset to jb-devThe Android Automerger2012-05-240-0/+0
| | |\ \ \
| * | \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-290-0/+0
| |\ \ \ \ \
* | \ \ \ \ \ am 86ba0734: Compute scroll limits correctlyJohn Reck2012-05-293-17/+31
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Compute scroll limits correctlyJohn Reck2012-05-253-17/+31
| |/ / / / /
* | | | | | am 5ac11a7e: Merge "Fix a browser crash related to HTML5 video." into jb-devTeng-Hui Zhu2012-05-251-9/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fix a browser crash related to HTML5 video." into jb-devTeng-Hui Zhu2012-05-251-9/+0
| |\ \ \ \ \
| | * | | | | Fix a browser crash related to HTML5 video.Teng-Hui Zhu2012-05-251-9/+0
* | | | | | | 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 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 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 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 917ab176: Support content detection metatagsJohn Reck2012-05-246-2/+49
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Support content detection metatagsJohn Reck2012-05-246-2/+49
* | | | | | | | 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 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 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
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |