Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD | Bill Yi | 2014-04-29 | 6 | -16/+20 |
|\ | |||||
| * | am 4118480a: am 80470cdf: Merge "Solve three memory leaks related to PatchCache" | Chris Craik | 2014-03-25 | 2 | -2/+16 |
| |\ | |||||
| * | | Update framework to use M33 Skia. DO NOT MERGE | Leon Scroggins III | 2014-03-20 | 1 | -1/+1 |
| * | | am 7c9bd98a: am 89513ee5: Merge "Fix projection offset caching - DO NOT MERGE... | Chris Craik | 2014-03-20 | 2 | -1/+3 |
| |\ \ | |||||
| | * | | Fix projection offset caching - DO NOT MERGE | Chris Craik | 2014-03-19 | 2 | -1/+3 |
| * | | | am 9a09a523: am 0b472ae1: Merge "androidfw: resolve 64-bit build issues" | Mark Salyzyn | 2014-03-19 | 6 | -98/+98 |
| |\ \ \ | |||||
| * \ \ \ | am bbf82665: am 6e2fb587: Merge "LP64: Make 9 patches architecture agnostic." | Narayan Kamath | 2014-03-11 | 3 | -40/+40 |
| |\ \ \ \ | |||||
| * \ \ \ \ | am 8fb22ae7: am eee2c72f: Merge "Various format string fixes for 64bit" | Narayan Kamath | 2014-03-11 | 1 | -4/+4 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | am 7b4cce68: am c3bac8a0: Merge "Fix graphics corruption caused by HWUI caches" | Chris Craik | 2014-03-11 | 4 | -15/+29 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | am 19256340: am 22c66639: Merge "Fixes for 64bit in libhwui" | Narayan Kamath | 2014-03-08 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | am b152473f: am 9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit compa... | Narayan Kamath | 2014-03-07 | 2 | -7/+12 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | am 128599e4: am 2b3c14bf: Merge "libandroidfw: fix build error for 64-bit" | Narayan Kamath | 2014-03-07 | 1 | -39/+36 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | am 28879bbf: am be57fca4: Merge "Extended locales in AAPT / AssetManager." | Narayan Kamath | 2014-03-07 | 3 | -46/+114 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | am 183e5e03: am 49024bac: Merge "AssetManager support for 3 letter lang/count... | Narayan Kamath | 2014-03-07 | 3 | -45/+347 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge "resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aosp" into kl... | Leon Scroggins III | 2014-03-07 | 4 | -14/+16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aosp | Leon Scroggins III | 2014-03-06 | 4 | -14/+16 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Update framework to use M33 Skia. DO NOT MERGE | Leon Scroggins III | 2014-03-06 | 4 | -14/+16 |
* | | | | | | | | | | | | | | am 89dddcc9: Merge "Use default visibility for Snapshot::getLocalClip." | Ben Cheng | 2014-04-02 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Use default visibility for Snapshot::getLocalClip. | Ben Cheng | 2014-04-02 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | am cd3f60f3: Merge "AArch64: Make frameworks/base code more portable" | Narayan Kamath | 2014-03-27 | 6 | -26/+29 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | AArch64: Make frameworks/base code more portable | Ashok Bhat | 2014-03-27 | 6 | -26/+29 |
* | | | | | | | | | | | | | | am 80470cdf: Merge "Solve three memory leaks related to PatchCache" | Chris Craik | 2014-03-25 | 2 | -2/+16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Solve three memory leaks related to PatchCache | Jens Gulin | 2014-03-25 | 2 | -2/+16 |
* | | | | | | | | | | | | | am 0b472ae1: Merge "androidfw: resolve 64-bit build issues" | Mark Salyzyn | 2014-03-19 | 6 | -98/+98 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | androidfw: resolve 64-bit build issues | Mark Salyzyn | 2014-03-19 | 6 | -98/+98 |
* | | | | | | | | | | | | am 6e2fb587: Merge "LP64: Make 9 patches architecture agnostic." | Narayan Kamath | 2014-03-10 | 3 | -40/+40 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
| * | | | | | | | | | | LP64: Make 9 patches architecture agnostic. | Narayan Kamath | 2014-03-10 | 3 | -40/+40 |
* | | | | | | | | | | | am eee2c72f: Merge "Various format string fixes for 64bit" | Narayan Kamath | 2014-02-28 | 1 | -4/+4 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | / | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
| * | | | | | | | | | Merge "Various format string fixes for 64bit" | Narayan Kamath | 2014-02-28 | 1 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Various format string fixes for 64bit | Kévin PETIT | 2014-02-24 | 1 | -4/+4 |
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| * | | | | | | | | | Fix AOSP build - DO NOT MERGE | Chris Craik | 2014-02-26 | 1 | -1/+1 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Fix graphics corruption caused by HWUI caches | Sangkyu Lee | 2014-02-26 | 4 | -15/+29 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge "Fixes for 64bit in libhwui" | Narayan Kamath | 2014-02-21 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Fixes for 64bit in libhwui | Kévin PETIT | 2014-02-21 | 2 | -2/+2 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | AArch64: Make AssetAtlasService 64-bit compatible | Ashok Bhat | 2014-02-20 | 2 | -7/+12 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | libandroidfw: fix build error for 64-bit | Patrik Bannura | 2014-02-20 | 1 | -39/+36 |
|/ / / / / | |||||
* | | | | | Extended locales in AAPT / AssetManager. | Narayan Kamath | 2014-02-14 | 3 | -46/+114 |
| |_|_|/ |/| | | | |||||
* | | | | AssetManager support for 3 letter lang/country codes. | Narayan Kamath | 2014-02-14 | 3 | -45/+347 |
|/ / / | |||||
* | | | Use size_t* in AssetManager::createIdmap | Colin Cross | 2014-02-11 | 1 | -1/+1 |
* | | | Merge "Runtime resource overlay, iteration 2" | Dianne Hackborn | 2014-02-11 | 2 | -172/+218 |
|\ \ \ | |||||
| * | | | Runtime resource overlay, iteration 2 | Mårten Kongstad | 2014-02-03 | 2 | -172/+218 |
* | | | | Merge "New command line tool 'idmap'" | Dianne Hackborn | 2014-02-11 | 2 | -1/+26 |
|\ \ \ \ | |/ / / | |||||
| * | | | New command line tool 'idmap' | Mårten Kongstad | 2014-02-03 | 2 | -1/+26 |
| |/ / | |||||
* | | | Fix TinyHashMap to use generic hash_type instead of hash_t | Ashok Bhat | 2014-02-07 | 1 | -4/+2 |
* | | | Merge "Fix for positioning of glyphs within a bitmap" | Chris Craik | 2014-02-05 | 1 | -3/+3 |
|\ \ \ | |/ / |/| | | |||||
| * | | Fix for positioning of glyphs within a bitmap | Alexander Toresson | 2014-01-23 | 1 | -3/+3 |
* | | | Change ResourceType cookies to int32_t. | Narayan Kamath | 2014-01-31 | 2 | -17/+17 |
* | | | AssetManager cookies should be int32_t and not void*. | Narayan Kamath | 2014-01-27 | 1 | -13/+12 |
|/ / | |||||
* | | Initialize pointer members to NULL to avoid illegal reference | lina.x.pi | 2014-01-17 | 1 | -1/+1 |
* | | Handle user-defined cache path for RS. | Tim Murray | 2013-12-18 | 1 | -1/+3 |