summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | am d8ff56c9: am c3d40b86: Merge "logd: Add Pid statistics"Mark Salyzyn2015-04-093-58/+248
|\ \ \ \ \ | |/ / / /
| * | | | am c3d40b86: Merge "logd: Add Pid statistics"Mark Salyzyn2015-04-083-58/+248
| |\ \ \ \ | | |/ / /
| | * | | Merge "logd: Add Pid statistics"Mark Salyzyn2015-04-083-58/+248
| | |\ \ \ | | | |/ /
| | | * | logd: Add Pid statisticsMark Salyzyn2015-04-083-58/+248
| | |/ /
* | | | am d71eca9e: am e322ae19: Merge "Revert "fs_mgr_verity: Add support for squas...Mohamad Ayyash2015-04-083-40/+26
|\ \ \ \ | |/ / /
| * | | am e322ae19: Merge "Revert "fs_mgr_verity: Add support for squashfs""Mohamad Ayyash2015-04-083-40/+26
| |\ \ \ | | |/ /
| | * | Merge "Revert "fs_mgr_verity: Add support for squashfs""Mohamad Ayyash2015-04-083-40/+26
| | |\ \
| | | * | Revert "fs_mgr_verity: Add support for squashfs"Mohamad Ayyash2015-04-083-40/+26
* | | | | am 48bfdb85: am 70f81cee: Merge "fs_mgr_verity: Add support for squashfs"Mohamad Ayyash2015-04-083-26/+40
|\ \ \ \ \ | |/ / / /
| * | | | am 70f81cee: Merge "fs_mgr_verity: Add support for squashfs"Mohamad Ayyash2015-04-083-26/+40
| |\ \ \ \ | | |/ / /
| | * | | Merge "fs_mgr_verity: Add support for squashfs"Mohamad Ayyash2015-04-083-26/+40
| | |\ \ \ | | | |/ / | | | | / | | | |/ | | |/|
| | | * fs_mgr_verity: Add support for squashfsMohamad Ayyash2015-04-063-26/+40
* | | | am 6e73780b: am 74a18757: Merge "Lose getprop to toybox."Elliott Hughes2015-04-082-51/+0
|\ \ \ \ | |/ / /
| * | | am 74a18757: Merge "Lose getprop to toybox."Elliott Hughes2015-04-082-51/+0
| |\ \ \ | | |/ /
| | * | Merge "Lose getprop to toybox."Elliott Hughes2015-04-082-51/+0
| | |\ \
| | | * | Lose getprop to toybox.Elliott Hughes2015-04-072-51/+0
* | | | | am 07e3ed46: am c19572fa: Merge "rootfs: init start logd in post-fs"Mark Salyzyn2015-04-081-0/+2
|\ \ \ \ \ | |/ / / /
| * | | | am c19572fa: Merge "rootfs: init start logd in post-fs"Mark Salyzyn2015-04-081-0/+2
| |\ \ \ \ | | |/ / /
| | * | | Merge "rootfs: init start logd in post-fs"Mark Salyzyn2015-04-081-0/+2
| | |\ \ \ | | | |/ / | | |/| |
| | | * | rootfs: init start logd in post-fsMark Salyzyn2015-04-081-0/+2
| | |/ /
* | | | am 6994d3fa: am bf403968: Merge "Lose setprop to toybox."Elliott Hughes2015-04-082-19/+0
|\ \ \ \ | |/ / /
| * | | am bf403968: Merge "Lose setprop to toybox."Elliott Hughes2015-04-082-19/+0
| |\ \ \ | | |/ /
| | * | Merge "Lose setprop to toybox."Elliott Hughes2015-04-082-19/+0
| | |\ \
| | | * | Lose setprop to toybox.Elliott Hughes2015-04-072-19/+0
* | | | | 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 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 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 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 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
* | | | 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
| | |/ /
* | | | DO NOT MERGE Add ANativeWindow dataSpace; update graphics formats, color spacesEino-Ville Talvala2015-04-062-38/+201
* | | | am dcc7aadb: (-s ours) Merge "DO NOT MERGE Add ANativeWindow dataSpace; updat...Dan Stoza2015-04-060-0/+0
|\ \ \ \ | |/ / /