summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 5056cdcd: am 01190672: am de957955: Merge "Create /data/system/heapdump fo...Nick Kralevich2015-04-081-0/+1
|\
| * am 01190672: am de957955: Merge "Create /data/system/heapdump for system_server"Nick Kralevich2015-04-081-0/+1
| |\
| | * am de957955: Merge "Create /data/system/heapdump for system_server"Nick Kralevich2015-04-081-0/+1
| | |\
| | | * Merge "Create /data/system/heapdump for system_server"Nick Kralevich2015-04-081-0/+1
| | | |\
| | | | * Create /data/system/heapdump for system_serverNick Kralevich2015-04-071-0/+1
| | | |/
* | | | am 1fb919a3: am 55f49af6: am 5ae7b1e5: Merge "Lose restorecon to toybox."Elliott Hughes2015-04-072-64/+0
|\ \ \ \ | |/ / /
| * | | am 55f49af6: am 5ae7b1e5: Merge "Lose restorecon to toybox."Elliott Hughes2015-04-072-64/+0
| |\ \ \ | | |/ /
| | * | am 5ae7b1e5: Merge "Lose restorecon to toybox."Elliott Hughes2015-04-072-64/+0
| | |\ \ | | | |/
| | | * Merge "Lose restorecon to toybox."Elliott Hughes2015-04-072-64/+0
| | | |\
| | | | * Lose restorecon to toybox.Elliott Hughes2015-04-072-64/+0
* | | | | am f09bfa3c: am 25482963: am 5fc47aae: Merge "logd: Don\'t embed a flexible a...Nick Kralevich2015-04-072-5/+17
|\ \ \ \ \ | |/ / / /
| * | | | am 25482963: am 5fc47aae: Merge "logd: Don\'t embed a flexible array member w...Nick Kralevich2015-04-072-5/+17
| |\ \ \ \ | | |/ / /
| | * | | am 5fc47aae: Merge "logd: Don\'t embed a flexible array member within another...Nick Kralevich2015-04-072-5/+17
| | |\ \ \ | | | |/ /
| | | * | Merge "logd: Don't embed a flexible array member within another struct"Nick Kralevich2015-04-072-5/+17
| | | |\ \ | | | | |/ | | | |/|
| | | | * logd: Don't embed a flexible array member within another structNick Kralevich2015-04-072-5/+17
| | | |/
* | | | am 13e8af05: am b6b66f8f: am 02f1d80a: Merge "Restore verity state when verif...Sami Tolvanen2015-04-071-20/+117
|\ \ \ \ | |/ / /
| * | | am b6b66f8f: am 02f1d80a: Merge "Restore verity state when verified partition...Sami Tolvanen2015-04-071-20/+117
| |\ \ \ | | |/ /
| | * | am 02f1d80a: Merge "Restore verity state when verified partition is reflashed"Sami Tolvanen2015-04-071-20/+117
| | |\ \ | | | |/
| | | * Merge "Restore verity state when verified partition is reflashed"Sami Tolvanen2015-04-071-20/+117
| | | |\
| | | | * Restore verity state when verified partition is reflashedSami Tolvanen2015-03-311-20/+117
* | | | | am 93c4b6c8: am ddaebb24: am 284c5cb2: Merge "Set verity mode as the verified...Sami Tolvanen2015-04-074-37/+44
|\ \ \ \ \ | |/ / / /
| * | | | am ddaebb24: am 284c5cb2: Merge "Set verity mode as the verified property value"Sami Tolvanen2015-04-074-37/+44
| |\ \ \ \ | | |/ / /
| | * | | am 284c5cb2: Merge "Set verity mode as the verified property value"Sami Tolvanen2015-04-074-37/+44
| | |\ \ \ | | | |/ /
| | | * | Merge "Set verity mode as the verified property value"Sami Tolvanen2015-04-074-37/+44
| | | |\ \ | | | | |/
| | | | * Set verity mode as the verified property valueSami Tolvanen2015-03-314-37/+44
* | | | | Merge "Mount point for expanded storage."Jeff Sharkey2015-04-071-0/+1
|\ \ \ \ \
| * | | | | Mount point for expanded storage.Jeff Sharkey2015-04-061-0/+1
* | | | | | am 2904e949: am 0bce68b4: am 33c2ad37: Merge "android_filesystem_config.h: us...Mark Salyzyn2015-04-061-6/+3
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 0bce68b4: am 33c2ad37: Merge "android_filesystem_config.h: use __BEGIN_DEC...Mark Salyzyn2015-04-061-6/+3
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | am 33c2ad37: Merge "android_filesystem_config.h: use __BEGIN_DECLS and __END_...Mark Salyzyn2015-04-061-6/+3
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge "android_filesystem_config.h: use __BEGIN_DECLS and __END_DECLS"Mark Salyzyn2015-04-061-6/+3
| | | |\ \ \
| | | | * | | android_filesystem_config.h: use __BEGIN_DECLS and __END_DECLSMark Salyzyn2015-04-061-6/+3
| | | |/ / /
* | | | | | am 772b9003: (-s ours) DO NOT MERGE Add ANativeWindow dataSpace; update graph...Eino-Ville Talvala2015-04-060-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | DO NOT MERGE Add ANativeWindow dataSpace; update graphics formats, color spacesEino-Ville Talvala2015-04-062-38/+201
* | | | | | android_filesystem_config: move fs_config to libcutilsMark Salyzyn2015-04-062-121/+27
* | | | | | am 6e233ae8: (-s ours) am dcc7aadb: (-s ours) Merge "DO NOT MERGE Add ANative...Dan Stoza2015-04-060-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am dcc7aadb: (-s ours) Merge "DO NOT MERGE Add ANativeWindow dataSpace; updat...Dan Stoza2015-04-060-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "DO NOT MERGE Add ANativeWindow dataSpace; update graphics formats, col...Dan Stoza2015-04-062-38/+201
| | |\ \ \ \
| | | * | | | DO NOT MERGE Add ANativeWindow dataSpace; update graphics formats, color spacesEino-Ville Talvala2015-04-062-38/+201
* | | | | | | am 835a04c8: am 5b16ceaf: am 08fe38e2: Merge "Allow inputflinger to have CAP_...Mark Salyzyn2015-04-060-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 5b16ceaf: am 08fe38e2: Merge "Allow inputflinger to have CAP_BLOCK_SUSPEND."Mark Salyzyn2015-04-061-1/+3
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 08fe38e2: Merge "Allow inputflinger to have CAP_BLOCK_SUSPEND."Mark Salyzyn2015-04-061-1/+3
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Merge "Allow inputflinger to have CAP_BLOCK_SUSPEND."Mark Salyzyn2015-04-061-1/+3
| | | |\ \ \ \
| | | | * | | | Allow inputflinger to have CAP_BLOCK_SUSPEND.Tim Kilbourn2015-04-061-1/+3
| | | |/ / / /
* | | | | | | am 8bd4bee8: (-s ours) am fb3c6ac0: am b137dab4: Merge "android_filesystem_co...Mark Salyzyn2015-04-060-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am fb3c6ac0: am b137dab4: Merge "android_filesystem_config: move fs_config to...Mark Salyzyn2015-04-062-120/+27
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am b137dab4: Merge "android_filesystem_config: move fs_config to libcutils"Mark Salyzyn2015-04-062-120/+27
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "android_filesystem_config: move fs_config to libcutils"Mark Salyzyn2015-04-062-120/+27
| | | |\ \ \ \
| | | | * | | | android_filesystem_config: move fs_config to libcutilsMark Salyzyn2015-04-062-120/+27
* | | | | | | | am 698198d0: am 8797b7a1: am d42df562: Merge "libcutils: add fs_config"Mark Salyzyn2015-04-062-0/+146
|\ \ \ \ \ \ \ \ | |/ / / / / / /