summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am e97dad0d: Merge "debuggerd: a few generic improvements"Elliott Hughes2014-01-315-129/+104
|\
| * Merge "debuggerd: a few generic improvements"Elliott Hughes2014-01-305-129/+104
| |\
| | * debuggerd: a few generic improvementsKévin PETIT2014-01-305-129/+104
* | | am 8623972d: Merge "Don\'t try to build libcorkscrew for LP64."Elliott Hughes2014-01-311-0/+4
|\ \ \ | |/ /
| * | Merge "Don't try to build libcorkscrew for LP64."Elliott Hughes2014-01-301-0/+4
| |\ \ | | |/ | |/|
| | * Don't try to build libcorkscrew for LP64.Elliott Hughes2014-01-301-0/+4
| |/
* | am caefe564: Merge "x86: Enable libunwind"Elliott Hughes2014-01-311-1/+1
|\ \ | |/
| * Merge "x86: Enable libunwind"Elliott Hughes2014-01-301-1/+1
| |\
| | * x86: Enable libunwindPavel Chupin2014-01-301-1/+1
| |/
* | am 7957529d: Merge "Clean up UnwindCurrent.cpp\'s use of ucontext.h."Christopher Ferris2014-01-311-21/+2
|\ \ | |/
| * Merge "Clean up UnwindCurrent.cpp's use of ucontext.h."Christopher Ferris2014-01-301-21/+2
| |\
| | * Clean up UnwindCurrent.cpp's use of ucontext.h.Christopher Ferris2014-01-301-21/+2
| |/
* | am 1686784a: Merge changes I6bffe1cd,I0984ba01Colin Cross2014-01-314-384/+407
|\ \ | |/
| * Merge changes I6bffe1cd,I0984ba01Colin Cross2014-01-304-384/+407
| |\
| | * fs_mgr: split fstab parsing into separate fileColin Cross2014-01-233-381/+404
| | * fs_mgr: update ext4_parse_sb to match change in ext4_utilsColin Cross2014-01-231-3/+3
* | | am 710f6634: Merge "Switch mips libcorkscrew over to <sys/ucontext.h>."Elliott Hughes2014-01-311-40/+5
|\ \ \ | |/ /
| * | Merge "Switch mips libcorkscrew over to <sys/ucontext.h>."Elliott Hughes2014-01-301-40/+5
| |\ \
| | * | Switch mips libcorkscrew over to <sys/ucontext.h>.Elliott Hughes2014-01-291-40/+5
| |/ /
* | | am 1ca10eab: Merge "Avoid redefinition of __STDC_FORMAT_MACROS."Ian Rogers2014-01-311-1/+0
|\ \ \ | |/ /
| * | Merge "Avoid redefinition of __STDC_FORMAT_MACROS."Ian Rogers2014-01-301-1/+0
| |\ \
| | * | Avoid redefinition of __STDC_FORMAT_MACROS.Ian Rogers2014-01-291-1/+0
* | | | am 59b5294f: Merge "Switch arm libcorkscrew over to <sys/ucontext.h>."Elliott Hughes2014-01-311-13/+1
|\ \ \ \ | |/ / /
| * | | Merge "Switch arm libcorkscrew over to <sys/ucontext.h>."Elliott Hughes2014-01-301-13/+1
| |\ \ \ | | |/ / | |/| |
| | * | Switch arm libcorkscrew over to <sys/ucontext.h>.Elliott Hughes2014-01-291-13/+1
* | | | am b99d5294: Merge "Switch x86 libcorkscrew over to <ucontext.h>."Elliott Hughes2014-01-311-40/+1
|\ \ \ \ | |/ / /
| * | | Merge "Switch x86 libcorkscrew over to <ucontext.h>."Elliott Hughes2014-01-301-40/+1
| |\ \ \
| | * | | Switch x86 libcorkscrew over to <ucontext.h>.Elliott Hughes2014-01-291-40/+1
| |/ / /
* | | | am 773c9ab7: am c96c2954: am a152ed73: Merge "Fix global pointing to local va...Christopher Ferris2014-01-291-3/+3
|\ \ \ \
| * \ \ \ am c96c2954: am a152ed73: Merge "Fix global pointing to local variable."Christopher Ferris2014-01-291-3/+3
| |\ \ \ \
| | * \ \ \ am a152ed73: Merge "Fix global pointing to local variable."Christopher Ferris2014-01-291-3/+3
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "Fix global pointing to local variable."Christopher Ferris2014-01-291-3/+3
| | | |\ \ \
| | | | * | | Fix global pointing to local variable.Christopher Ferris2014-01-281-3/+3
| | | |/ / /
* | | | | | am a40636f3: am 5abe06bf: am 6e34793b: Merge "Fix code style, put unused in t...Kristian Monsen2014-01-281-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 5abe06bf: am 6e34793b: Merge "Fix code style, put unused in the end"Kristian Monsen2014-01-281-2/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 6e34793b: Merge "Fix code style, put unused in the end"Kristian Monsen2014-01-281-2/+2
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "Fix code style, put unused in the end"Kristian Monsen2014-01-281-2/+2
| | | |\ \ \
| | | | * | | Fix code style, put unused in the endKristian Monsen2014-01-281-2/+2
* | | | | | | am aaf89887: am 6fe31b2f: am d391c9b4: Merge "Re-enable libunwind for arm."Christopher Ferris2014-01-2818-120/+298
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 6fe31b2f: am d391c9b4: Merge "Re-enable libunwind for arm."Christopher Ferris2014-01-2818-120/+298
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am d391c9b4: Merge "Re-enable libunwind for arm."Christopher Ferris2014-01-2818-120/+298
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "Re-enable libunwind for arm."Christopher Ferris2014-01-2818-120/+298
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | Re-enable libunwind for arm.Christopher Ferris2014-01-2818-120/+298
| | | | |/ /
* | | | | | am 7b9bb36a: am 0256e1f6: am d2acdd82: Merge changes I70ab37d5,I716f89c0,I34c...Mark Salyzyn2014-01-2840-576/+2974
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 0256e1f6: am d2acdd82: Merge changes I70ab37d5,I716f89c0,I34c96adf,I776509...Mark Salyzyn2014-01-2840-576/+2974
| |\ \ \ \ \ | | |/ / / /
| | * | | | am d2acdd82: Merge changes I70ab37d5,I716f89c0,I34c96adf,I77650923,I35b0d1ee,...Mark Salyzyn2014-01-2840-576/+2974
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge changes I70ab37d5,I716f89c0,I34c96adf,I77650923,I35b0d1ee, ...Mark Salyzyn2014-01-2840-576/+2974
| | | |\ \ \
| | | | * | | libsysutils: SocketListener export releaseMark Salyzyn2014-01-272-26/+53
| | | | * | | libsysutils: Add iovec/runOnEachSocketMark Salyzyn2014-01-275-36/+137
| | | | * | | liblog: support struct logger_event_v2 formatMark Salyzyn2014-01-271-6/+15