summaryrefslogtreecommitdiffstats
path: root/libs
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEADBill Yi2014-04-296-16/+20
|\
| * am 4118480a: am 80470cdf: Merge "Solve three memory leaks related to PatchCache"Chris Craik2014-03-252-2/+16
| |\
| * | Update framework to use M33 Skia. DO NOT MERGELeon Scroggins III2014-03-201-1/+1
| * | am 7c9bd98a: am 89513ee5: Merge "Fix projection offset caching - DO NOT MERGE...Chris Craik2014-03-202-1/+3
| |\ \
| | * | Fix projection offset caching - DO NOT MERGEChris Craik2014-03-192-1/+3
| * | | am 9a09a523: am 0b472ae1: Merge "androidfw: resolve 64-bit build issues"Mark Salyzyn2014-03-196-98/+98
| |\ \ \
| * \ \ \ am bbf82665: am 6e2fb587: Merge "LP64: Make 9 patches architecture agnostic."Narayan Kamath2014-03-113-40/+40
| |\ \ \ \
| * \ \ \ \ am 8fb22ae7: am eee2c72f: Merge "Various format string fixes for 64bit"Narayan Kamath2014-03-111-4/+4
| |\ \ \ \ \
| * \ \ \ \ \ am 7b4cce68: am c3bac8a0: Merge "Fix graphics corruption caused by HWUI caches"Chris Craik2014-03-114-15/+29
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am 19256340: am 22c66639: Merge "Fixes for 64bit in libhwui"Narayan Kamath2014-03-082-2/+2
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am b152473f: am 9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit compa...Narayan Kamath2014-03-072-7/+12
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am 128599e4: am 2b3c14bf: Merge "libandroidfw: fix build error for 64-bit"Narayan Kamath2014-03-071-39/+36
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am 28879bbf: am be57fca4: Merge "Extended locales in AAPT / AssetManager."Narayan Kamath2014-03-073-46/+114
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am 183e5e03: am 49024bac: Merge "AssetManager support for 3 letter lang/count...Narayan Kamath2014-03-073-45/+347
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge "resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aosp" into kl...Leon Scroggins III2014-03-074-14/+16
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aospLeon Scroggins III2014-03-064-14/+16
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Update framework to use M33 Skia. DO NOT MERGELeon Scroggins III2014-03-064-14/+16
* | | | | | | | | | | | | | am 89dddcc9: Merge "Use default visibility for Snapshot::getLocalClip."Ben Cheng2014-04-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Use default visibility for Snapshot::getLocalClip.Ben Cheng2014-04-021-1/+1
* | | | | | | | | | | | | | | am cd3f60f3: Merge "AArch64: Make frameworks/base code more portable"Narayan Kamath2014-03-276-26/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | AArch64: Make frameworks/base code more portableAshok Bhat2014-03-276-26/+29
* | | | | | | | | | | | | | am 80470cdf: Merge "Solve three memory leaks related to PatchCache"Chris Craik2014-03-252-2/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | Solve three memory leaks related to PatchCacheJens Gulin2014-03-252-2/+16
* | | | | | | | | | | | | am 0b472ae1: Merge "androidfw: resolve 64-bit build issues"Mark Salyzyn2014-03-196-98/+98
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | androidfw: resolve 64-bit build issuesMark Salyzyn2014-03-196-98/+98
* | | | | | | | | | | | am 6e2fb587: Merge "LP64: Make 9 patches architecture agnostic."Narayan Kamath2014-03-103-40/+40
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | LP64: Make 9 patches architecture agnostic.Narayan Kamath2014-03-103-40/+40
* | | | | | | | | | | am eee2c72f: Merge "Various format string fixes for 64bit"Narayan Kamath2014-02-281-4/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | / | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Merge "Various format string fixes for 64bit"Narayan Kamath2014-02-281-4/+4
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Various format string fixes for 64bitKévin PETIT2014-02-241-4/+4
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Fix AOSP build - DO NOT MERGEChris Craik2014-02-261-1/+1
|/ / / / / / / / /
* | | | | | | | | Fix graphics corruption caused by HWUI cachesSangkyu Lee2014-02-264-15/+29
|/ / / / / / / /
* | | | | | | | Merge "Fixes for 64bit in libhwui"Narayan Kamath2014-02-212-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Fixes for 64bit in libhwuiKévin PETIT2014-02-212-2/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | AArch64: Make AssetAtlasService 64-bit compatibleAshok Bhat2014-02-202-7/+12
| |_|_|_|_|/ |/| | | | |
* | | | | | libandroidfw: fix build error for 64-bitPatrik Bannura2014-02-201-39/+36
|/ / / / /
* | | | | Extended locales in AAPT / AssetManager.Narayan Kamath2014-02-143-46/+114
| |_|_|/ |/| | |
* | | | AssetManager support for 3 letter lang/country codes.Narayan Kamath2014-02-143-45/+347
|/ / /
* | | Use size_t* in AssetManager::createIdmapColin Cross2014-02-111-1/+1
* | | Merge "Runtime resource overlay, iteration 2"Dianne Hackborn2014-02-112-172/+218
|\ \ \
| * | | Runtime resource overlay, iteration 2Mårten Kongstad2014-02-032-172/+218
* | | | Merge "New command line tool 'idmap'"Dianne Hackborn2014-02-112-1/+26
|\ \ \ \ | |/ / /
| * | | New command line tool 'idmap'Mårten Kongstad2014-02-032-1/+26
| |/ /
* | | Fix TinyHashMap to use generic hash_type instead of hash_tAshok Bhat2014-02-071-4/+2
* | | Merge "Fix for positioning of glyphs within a bitmap"Chris Craik2014-02-051-3/+3
|\ \ \ | |/ / |/| |
| * | Fix for positioning of glyphs within a bitmapAlexander Toresson2014-01-231-3/+3
* | | Change ResourceType cookies to int32_t.Narayan Kamath2014-01-312-17/+17
* | | AssetManager cookies should be int32_t and not void*.Narayan Kamath2014-01-271-13/+12
|/ /
* | Initialize pointer members to NULL to avoid illegal referencelina.x.pi2014-01-171-1/+1
* | Handle user-defined cache path for RS.Tim Murray2013-12-181-1/+3