summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Support selections within scrollable text areas."George Mount2012-06-042-40/+56
|\
| * Support selections within scrollable text areas.George Mount2012-06-042-40/+56
* | Merge "Change from left/right to base/extent for selection handles."George Mount2012-06-044-23/+62
|\ \ | |/
| * Change from left/right to base/extent for selection handles.George Mount2012-06-014-23/+62
* | am c2973319: am 06100d01: Merge "Disable clipping on the base surface" into j...Chris Craik2012-06-022-11/+14
|\ \
| * \ am 06100d01: Merge "Disable clipping on the base surface" into jb-devChris Craik2012-06-022-11/+14
| |\ \
| | * \ Merge "Disable clipping on the base surface" into jb-devChris Craik2012-06-022-11/+14
| | |\ \
| | | * | Disable clipping on the base surfaceChris Craik2012-06-012-11/+14
* | | | | am f3e42950: am 6b850721: Fixed mistake in how label was being mistakenly set...George Mount2012-06-011-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 6b850721: Fixed mistake in how label was being mistakenly set into name.George Mount2012-06-011-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Fixed mistake in how label was being mistakenly set into name.George Mount2012-06-011-1/+1
* | | | | am c6990706: am 678de4ac: Fix document.createTouchList crash.Ben Murdoch2012-06-016-10/+60
|\ \ \ \ \ | |/ / / /
| * | | | am 678de4ac: Fix document.createTouchList crash.Ben Murdoch2012-06-016-10/+60
| |\ \ \ \ | | |/ / /
| | * | | Fix document.createTouchList crash.Ben Murdoch2012-06-016-10/+60
| | |/ /
* | | | am c40f87a1: am b5d3edac: Merge "Invalidate webview content on setBackgroundC...Chris Craik2012-05-311-0/+7
|\ \ \ \ | |/ / /
| * | | am b5d3edac: Merge "Invalidate webview content on setBackgroundColor" into jb...Chris Craik2012-05-311-0/+7
| |\ \ \ | | |/ /
| | * | Merge "Invalidate webview content on setBackgroundColor" into jb-devChris Craik2012-05-311-0/+7
| | |\ \
| | | * | Invalidate webview content on setBackgroundColorChris Craik2012-05-311-0/+7
* | | | | am 9af7514f: am effdd108: Don\'t allow merging within an animated layerChris Craik2012-05-312-7/+12
|\ \ \ \ \ | |/ / / /
| * | | | am effdd108: Don\'t allow merging within an animated layerChris Craik2012-05-312-7/+12
| |\ \ \ \ | | |/ / /
| | * | | Don't allow merging within an animated layerChris Craik2012-05-312-7/+12
| | |/ /
* | | | am b1005282: am 150a26fa: Fix animation in single surface modeTeng-Hui Zhu2012-05-314-27/+27
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | am 150a26fa: Fix animation in single surface modeTeng-Hui Zhu2012-05-314-27/+27
| |\ \ | | |/
| | * Fix animation in single surface modeTeng-Hui Zhu2012-05-314-27/+27
* | | am 5ace2391: am 6f60c96b: Merge "Don\'t override X-Requested-With if it is al...John Reck2012-05-301-1/+1
|\ \ \ | |/ /
| * | am 6f60c96b: Merge "Don\'t override X-Requested-With if it is already set" in...John Reck2012-05-301-1/+1
| |\ \ | | |/
| | * Merge "Don't override X-Requested-With if it is already set" into jb-devJohn Reck2012-05-301-1/+1
| | |\
| | | * Don't override X-Requested-With if it is already setJohn Reck2012-05-301-1/+1
* | | | am 5ce4bd8d: am db590796: Merge "Minimize tearing for fixed element in single...Teng-Hui Zhu2012-05-306-12/+28
|\ \ \ \ | |/ / /
| * | | 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 08241ef7: am e4d0c197: Merge "Draw entire layer tree in capturePicture()" ...Chris Craik2012-05-302-2/+11
|\ \ \ \ \ | |/ / / /
| * | | | 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
| | | |/
* | | | am 97a832f0: Reconcile with jb-releaseThe Android Open Source Project2012-05-300-0/+0
|\ \ \ \ | |/ / /
| * | | 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 c83120b4: am 658c3ec9: Merge "Consider frame offset for text snap rectangl...George Mount2012-05-302-19/+13
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 1d51221c: am 4a0b0816: Merge "Don\'t use setupPaintFill for drawBitmap" in...John Reck2012-05-293-2/+15
|\ \ \ \ \ | |/ / / /
| * | | | 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 07e81ac8: am 86c18a99: Fix for wrong positioningNicolas Roard2012-05-291-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 86c18a99: Fix for wrong positioningNicolas Roard2012-05-291-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Fix for wrong positioningNicolas Roard2012-05-291-1/+1