summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | 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
* | | | | | | am 9f927208: am bc9eaa14: Merge "Reduce UI-thread computation" into jb-devChris Craik2012-05-297-40/+24
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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 e0c18376: am 6184a1df: Disable copyScrollPosition for iframesJohn Reck2012-05-291-0/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 6184a1df: Disable copyScrollPosition for iframesJohn Reck2012-05-291-0/+3
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Disable copyScrollPosition for iframesJohn Reck2012-05-291-0/+3
| | | |/ / / / | | |/| | | |
* | | | | | | am 07cf80e3: Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-290-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| | | | | | |
| | \ \ \ \ \
| *-. \ \ \ \ \ 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 eeb490ff: am 86ba0734: Compute scroll limits correctlyJohn Reck2012-05-293-17/+31
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 86ba0734: Compute scroll limits correctlyJohn Reck2012-05-293-17/+31
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| | * | | | | | | | Compute scroll limits correctlyJohn Reck2012-05-253-17/+31
| | |/ / / / / / /
* | | | | | | | | Merge "Make sure we don't use GPS when not required"Steve Block2012-05-291-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make sure we don't use GPS when not requiredSteve Block2012-05-291-0/+1
* | | | | | | | | | am 05506155: am 5ac11a7e: Merge "Fix a browser crash related to HTML5 video."...Teng-Hui Zhu2012-05-251-9/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | 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
| | |\ \ \ \ \ \ \ \