summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* am 3523e4fc: am efe085ff: Merge "Handle bad ninepatch data." into lmp-mr1-devLeon Scroggins III2015-01-271-3/+3
|\
| * Handle bad ninepatch data.Leon Scroggins III2015-01-271-3/+3
* | am aee7225e: Merge "Process base APK" into lmp-mr1-devAdam Lesinski2015-01-201-1/+1
|\ \ | |/
| * Process base APKAdam Lesinski2015-01-161-1/+1
* | am 9568307c: am 43a4a8c7: Fix redundant file backupsChristopher Tate2015-01-151-1/+1
|\ \ | |/
| * Fix redundant file backupsChristopher Tate2015-01-141-1/+1
* | am 740acf21: am c7801877: Merge "Fix issue where non-resource attributes woul...Adam Lesinski2014-12-111-3/+8
|\ \ | |/
| * Fix issue where non-resource attributes would cause obtainStyleAttributes to ...Adam Lesinski2014-12-101-3/+8
* | Merge commit '0953ab27' into manualmergeAdam Lesinski2014-12-051-0/+3
|\ \ | |/
| * AAPT: Move private attrs to new type for frameworkAdam Lesinski2014-12-031-0/+3
* | am 503071ae: am a2b5067a: Merge "RRO: prevent duplicate system overlays"Adam Lesinski2014-12-041-0/+2
|\ \
| * \ Merge "RRO: prevent duplicate system overlays"Adam Lesinski2014-12-031-0/+2
| |\ \
| | * | RRO: prevent duplicate system overlaysMÃ¥rten Kongstad2014-11-071-0/+2
* | | | Merge commit '06d8b7b8' into manualmergeAdam Lesinski2014-11-171-0/+201
|\ \ \ \ | | |_|/ | |/| |
| * | | Implement back-tracking when searching for attributes in XML or resource bagAdam Lesinski2014-11-041-0/+201
* | | | am f89a2fda: Merge "Frameworks/base: Fix two warnings in cmds"Andreas Gampe2014-11-081-3/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Frameworks/base: Fix two warnings in cmdsAndreas Gampe2014-11-081-3/+1
* | | | resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aospAndreas Gampe2014-11-071-2/+2
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Frameworks/base: Wall Werror in libs/androidfwAndreas Gampe2014-11-071-2/+2
| |/
| * am 8bdb265f: am 19f9d54f: Merge "Fix backwards compat problem with AAPT publi...Adam Lesinski2014-09-191-0/+2
| |\
| * \ am d3d6ecdb: am 52e5e359: Merge "USB string descriptors are not UTF8, so it i...Mike Lockwood2014-09-191-0/+3
| |\ \
| * \ \ am a38e59b1: am 683872af: Merge "Clean entire arg block when setting process ...Jeff Brown2014-09-121-3/+1
| |\ \ \
| * \ \ \ resolved conflicts for merge of 6c585756 to lmp-dev-plus-aospDan Albert2014-09-081-10/+10
| |\ \ \ \
| | * \ \ \ Merge "Use char16_t for char things."Dan Albert2014-09-091-10/+10
| | |\ \ \ \
| | | * | | | Use char16_t for char things.Dan Albert2014-09-081-10/+10
| | * | | | | Disable compilation based on vold.decrypt. [frameworks/base]Brian Carlstrom2014-07-311-0/+1
| | * | | | | Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [framewor...Brian Carlstrom2014-07-311-0/+4
* | | | | | | Merge "Fix issues that will be present in C++11" into lmp-mr1-devAdam Lesinski2014-11-031-12/+23
|\ \ \ \ \ \ \
| * | | | | | | Fix issues that will be present in C++11Adam Lesinski2014-11-031-12/+23
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Distinguish unspecified and explicit null values in resourcesAlan Viverette2014-10-291-1/+10
|/ / / / / /
* | | | | | Merge "Fix backwards compat problem with AAPT public attrs" into lmp-devAdam Lesinski2014-09-191-0/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix backwards compat problem with AAPT public attrsAdam Lesinski2014-09-181-0/+2
| | |_|_|/ | |/| | |
* | | | | Merge "USB string descriptors are not UTF8, so it is not safe to treat them a...Mike Lockwood2014-09-191-0/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | USB string descriptors are not UTF8, so it is not safe to treat them as such.Mike Lockwood2014-09-081-0/+3
| |/ / /
* | | | Clean entire arg block when setting process name.Jeff Brown2014-09-111-3/+1
|/ / /
* | | Stamp platform version code into app ApksAdam Lesinski2014-08-271-1/+1
* | | Introduce anydpi density resource qualifierAdam Lesinski2014-08-251-0/+1
* | | AAPT: Fix regression generating dynamic ref table for shared librariesAdam Lesinski2014-08-201-0/+3
* | | Merge "AAPT support for feature splits" into lmp-devAdam Lesinski2014-08-091-0/+2
|\ \ \
| * | | AAPT support for feature splitsAdam Lesinski2014-08-041-0/+2
* | | | Disable compilation based on vold.decrypt. [frameworks/base]Brian Carlstrom2014-08-061-0/+1
* | | | Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [framewor...Brian Carlstrom2014-08-061-0/+4
|/ / /
* | | Merge "Add kModeSync" into lmp-devBo Liu2014-07-241-1/+6
|\ \ \
| * | | Add kModeSyncJohn Reck2014-07-241-1/+6
* | | | Move Canvas.h to a new location so that it can be shared with HWUI.Derek Sollenberger2014-07-251-0/+143
|/ / /
* | | Allow for appending of resources to an AssetManager.Martin Kosiba2014-07-171-0/+1
* | | am ce75618e: am 5aba0149: am b85afb38: Merge "Make dex2oat heap size product ...Brian Carlstrom2014-07-091-0/+8
|\ \ \
| * \ \ am 5aba0149: am b85afb38: Merge "Make dex2oat heap size product configurable ...Brian Carlstrom2014-07-091-0/+8
| |\ \ \ | | |/ /
| | * | Make dex2oat heap size product configurable [frameworks/base]Brian Carlstrom2014-07-081-0/+8
| | |/
* | | Support multiple resource tables with same packageAdam Lesinski2014-06-183-13/+222