summaryrefslogtreecommitdiffstats
path: root/libs
Commit message (Expand)AuthorAgeFilesLines
* am bbf82665: am 6e2fb587: Merge "LP64: Make 9 patches architecture agnostic."Narayan Kamath2014-03-103-40/+40
|\
| * 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 8fb22ae7: am eee2c72f: Merge "Various format string fixes for 64bit"Narayan Kamath2014-02-281-4/+4
|\ \ \ | |/ /
| * | 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
| |/ /
* | | am 6ca90042: Add touch.wake IDC property to control wakeup.Jeff Brown2014-02-272-5/+10
|\ \ \
| * | | Add touch.wake IDC property to control wakeup.Jeff Brown2014-02-262-5/+10
* | | | am 7b4cce68: am c3bac8a0: Merge "Fix graphics corruption caused by HWUI caches"Chris Craik2014-02-264-15/+29
|\ \ \ \ | | |/ / | |/| |
| * | | Fix graphics corruption caused by HWUI cachesSangkyu Lee2014-02-264-15/+29
| | |/ | |/|
* | | am 19256340: am 22c66639: Merge "Fixes for 64bit in libhwui"Narayan Kamath2014-02-212-2/+2
|\ \ \ | |/ /
| * | Merge "Fixes for 64bit in libhwui"Narayan Kamath2014-02-212-2/+2
| |\ \
| | * | Fixes for 64bit in libhwuiKévin PETIT2014-02-212-2/+2
* | | | am b152473f: am 9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit compa...Narayan Kamath2014-02-202-7/+12
|\ \ \ \ | |/ / /
| * | | AArch64: Make AssetAtlasService 64-bit compatibleAshok Bhat2014-02-202-7/+12
* | | | am 128599e4: am 2b3c14bf: Merge "libandroidfw: fix build error for 64-bit"Narayan Kamath2014-02-201-39/+36
|\ \ \ \ | |/ / /
| * | | libandroidfw: fix build error for 64-bitPatrik Bannura2014-02-201-39/+36
| |/ /
* | | am 28879bbf: am be57fca4: Merge "Extended locales in AAPT / AssetManager."Narayan Kamath2014-02-173-46/+114
|\ \ \ | |/ /
| * | Extended locales in AAPT / AssetManager.Narayan Kamath2014-02-143-46/+114
* | | am 183e5e03: am 49024bac: Merge "AssetManager support for 3 letter lang/count...Narayan Kamath2014-02-173-45/+347
|\ \ \ | |/ /
| * | AssetManager support for 3 letter lang/country codes.Narayan Kamath2014-02-143-45/+347
* | | am aa98fb51: am f991771f: Merge "Use size_t* in AssetManager::createIdmap"Narayan Kamath2014-02-121-1/+1
|\ \ \ | |/ /
| * | Use size_t* in AssetManager::createIdmapColin Cross2014-02-111-1/+1
* | | resolved conflicts for merge of 4ad93639 to klp-modular-dev-plus-aospNick Kralevich2014-02-122-172/+218
|\ \ \ | |/ /
| * | Merge "Runtime resource overlay, iteration 2"Dianne Hackborn2014-02-112-172/+218
| |\ \
| | * | Runtime resource overlay, iteration 2Mårten Kongstad2014-02-032-172/+218
* | | | am 38f96e50: Add support for injecting events into ActivityContainers. (DO NO...Jeff Brown2014-02-123-91/+147
|\ \ \ \ | | |_|/ | |/| |
| * | | Add support for injecting events into ActivityContainers. (DO NOT MERGE)Jeff Brown2014-02-113-91/+147
* | | | am 0cd115e1: am 578087e3: Merge "New command line tool \'idmap\'"Dianne Hackborn2014-02-112-1/+26
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "New command line tool 'idmap'"Dianne Hackborn2014-02-112-1/+26
| |\ \ \ | | | |/ | | |/|
| | * | New command line tool 'idmap'Mårten Kongstad2014-02-032-1/+26
* | | | am 5f7c0b1d: am 6d8b21a8: Merge "Fix TinyHashMap to use generic hash_type ins...Narayan Kamath2014-02-111-4/+2
|\ \ \ \ | |/ / /
| * | | Fix TinyHashMap to use generic hash_type instead of hash_tAshok Bhat2014-02-071-4/+2
* | | | am 0ec3ca6e: am 449273e2: Merge "Fix for positioning of glyphs within a bitmap"Chris Craik2014-02-051-3/+3
|\ \ \ \ | |/ / /
| * | | 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
* | | | am 9af95574: am 1cadc07d: Merge "Change ResourceType cookies to int32_t."Narayan Kamath2014-01-312-17/+17
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Change ResourceType cookies to int32_t.Narayan Kamath2014-01-312-17/+17
* | | am 30e20ac5: am ebd43d46: am dff83e2b: am d5970e9c: Merge "AssetManager cooki...Narayan Kamath2014-01-271-13/+12
|\ \ \ | |/ /
| * | AssetManager cookies should be int32_t and not void*.Narayan Kamath2014-01-271-13/+12
| |/
* | am 38cf0704: am e9a7d229: am 66b5a2b2: am 5150eb8f: Merge "Initialize pointer...Chris Craik2014-01-171-1/+1
|\ \ | |/
| * Initialize pointer members to NULL to avoid illegal referencelina.x.pi2014-01-171-1/+1
* | Move some system services to separate directoriesAmith Yamasani2013-12-1941-0/+28732
|/
* Handle user-defined cache path for RS.Tim Murray2013-12-181-1/+3
* Add libutils dependency for libandroidfw host build.Narayan Kamath2013-12-111-2/+1
* Reimplement ZipFileRO in terms of libziparchive.Narayan Kamath2013-12-097-1004/+249
* Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEADThe Android Open Source Project2013-11-2291-7635/+5698
|\
| * Take SkBitmap's stride into account when uploading texturesRomain Guy2013-09-255-18/+29