summaryrefslogtreecommitdiffstats
path: root/libs
Commit message (Expand)AuthorAgeFilesLines
* move libandroidfw to frameworks/nativeMike Lockwood2013-10-0319-14047/+0
* Merge "add a test for BackupData helpers."Chris Wren2013-10-012-0/+439
|\
| * add a test for BackupData helpers.Chris Wren2013-09-252-0/+439
* | am b4d4d687: am 318ae7bb: Take SkBitmap\'s stride into account when uploading...Romain Guy2013-09-255-18/+29
|\ \ | |/ |/|
| * Take SkBitmap's stride into account when uploading texturesRomain Guy2013-09-255-18/+29
* | am bd842f96: am d8a84a86: Merge "Correct bitmap merging logic" into klp-devChris Craik2013-09-205-13/+8
|\ \ | |/
| * Merge "Correct bitmap merging logic" into klp-devChris Craik2013-09-215-13/+8
| |\
| | * Correct bitmap merging logicChris Craik2013-09-205-13/+8
* | | am ab99b39d: am ddc0a63d: Merge "fix emoji clipping in hw draw path" into klp...Victoria Lease2013-09-201-1/+1
|\ \ \ | |/ /
| * | fix emoji clipping in hw draw pathVictoria Lease2013-09-191-1/+1
| |/
* | resolved conflicts for merge of d97303a7 to masterChris Craik2013-09-174-18/+43
|\ \ | |/
| * Merge "Conservatively estimate geometry bounds" into klp-devChris Craik2013-09-184-18/+43
| |\
| | * Conservatively estimate geometry boundsChris Craik2013-09-174-18/+43
* | | am 7cb404dd: am a42ceb03: Merge "Disallow negative scale matrices in merged B...Chris Craik2013-09-174-3/+21
|\ \ \ | |/ /
| * | Merge "Disallow negative scale matrices in merged Bitmap drawing" into klp-devChris Craik2013-09-184-3/+21
| |\ \
| | * | Disallow negative scale matrices in merged Bitmap drawingChris Craik2013-09-164-3/+21
| | |/
* | | am bb451bda: am 0d3c52d3: Merge "Fix merged operation clipping" into klp-devChris Craik2013-09-131-1/+1
|\ \ \ | |/ /
| * | Fix merged operation clippingChris Craik2013-09-131-1/+1
| |/
* | am 0885b291: am 4801a4f9: Merge "Always disable the clip for layers Bug #8149...Romain Guy2013-09-121-4/+2
|\ \ | |/
| * Always disable the clip for layersRomain Guy2013-09-121-4/+2
* | am 3f30e67a: am 88ee0dac: Merge "Move DeferredDisplayState out of ops" into k...Chris Craik2013-09-126-143/+195
|\ \ | |/
| * Merge "Move DeferredDisplayState out of ops" into klp-devChris Craik2013-09-126-143/+195
| |\
| | * Move DeferredDisplayState out of opsChris Craik2013-09-126-143/+195
* | | am efbfe81d: am 931f6f87: Merge "Fix another off-by-one error in ZipFileRO" i...Kenny Root2013-09-111-1/+1
|\ \ \ | |/ /
| * | Fix another off-by-one error in ZipFileROKenny Root2013-09-111-1/+1
* | | am d9141d93: am d292f790: Merge "Reconcile differences between zip implementa...Kenny Root2013-09-111-65/+129
|\ \ \ | |/ /
| * | Reconcile differences between zip implementationsKenny Root2013-09-111-65/+129
| * | Revert "Reconcile differences between zip implementations"Kenny Root2013-09-111-129/+65
* | | Revert "Reconcile differences between zip implementations"Kenny Root2013-09-111-129/+65
* | | am feaa3be3: am 139ae547: Merge "Reconcile differences between zip implementa...Kenny Root2013-09-111-65/+129
|\ \ \ | |/ /
| * | Reconcile differences between zip implementationsKenny Root2013-09-111-65/+129
* | | am 53760b4a: am 874ae2ad: Merge "Fix scissor for functor invocation" into klp...John Reck2013-09-101-2/+4
|\ \ \ | |/ /
| * | Merge "Fix scissor for functor invocation" into klp-devJohn Reck2013-09-101-2/+4
| |\ \
| | * | Fix scissor for functor invocationJohn Reck2013-09-101-2/+4
* | | | am 19c727bb: am 895a4375: Merge "Fix FontRenderer bug." into klp-devTim Murray2013-09-101-1/+1
|\ \ \ \ | |/ / /
| * | | Fix FontRenderer bug.Tim Murray2013-09-101-1/+1
| |/ /
* | | am 9163b1d9: am 23ae1461: Merge "Add flags word to initialization." into klp-devTim Murray2013-09-091-1/+1
|\ \ \ | |/ /
| * | Add flags word to initialization.Tim Murray2013-09-091-1/+1
| |/
* | am 9b824560: am 9b40bdf6: Merge "Dump the right matrix when logging display l...Chris Craik2013-09-061-1/+1
|\ \ | |/
| * Dump the right matrix when logging display listsChris Craik2013-09-051-1/+1
* | am 7ff37ada: am ff2c22e2: Merge "Move functor GL setup to just before functor...Chris Craik2013-08-261-6/+9
|\ \ | |/
| * Move functor GL setup to just before functorChris Craik2013-08-261-6/+9
* | am c1acf799: am 243a026b: Merge "Second attempt at avoiding infinite loop in ...Romain Guy2013-08-211-1/+16
|\ \ | |/
| * Second attempt at avoiding infinite loop in PathCache::trim()Romain Guy2013-08-211-1/+16
* | am b7db6d73: am e0a2435c: Merge "Properly account for created paths in the ca...Romain Guy2013-08-212-1/+6
|\ \ | |/
| * Properly account for created paths in the cacheRomain Guy2013-08-212-1/+6
* | am dfb79408: am 5b8efc47: Merge "Add overdraw debugging that accounts for Deu...Romain Guy2013-08-214-9/+52
|\ \ | |/
| * Add overdraw debugging that accounts for DeuteranomalyRomain Guy2013-08-214-9/+52
* | am 816f3058: am cf8e6778: Merge "Handle updates to C++ API." into klp-devTim Murray2013-08-201-2/+3
|\ \ | |/
| * Handle updates to C++ API.Tim Murray2013-08-191-2/+3