summaryrefslogtreecommitdiffstats
path: root/cmds
Commit message (Expand)AuthorAgeFilesLines
* am 3e785e2e: am 88c52865: am 0faebfb2: Merge "Add trace_event_clock_sync to a...John Reck2015-03-271-0/+13
|\
| * Add trace_event_clock_sync to atraceJohn Reck2015-03-261-0/+13
* | am da08fc67: am b84a3dde: am bc5aceb1: Merge "Store odex files in oat/<isa>/ ...Richard Uhler2015-03-261-14/+38
|\ \ | |/
| * Store odex files in oat/<isa>/ directory.Richard Uhler2015-03-251-14/+38
* | am a290b4b9: am b4cf4d7d: am 6dad1713: Merge "Use verify-at-runtime if debug....Mathieu Chartier2015-03-231-0/+7
|\ \ | |/
| * Merge "Use verify-at-runtime if debug.usejit is true"Mathieu Chartier2015-03-211-0/+7
| |\
| | * Use verify-at-runtime if debug.usejit is trueMathieu Chartier2015-03-201-0/+7
* | | am 4b9d0b9b: am f3201498: Merge "dumpstate: add O_CLOEXEC"Nick Kralevich2015-03-192-11/+11
|\ \ \ | |/ /
| * | dumpstate: add O_CLOEXECNick Kralevich2015-03-192-11/+11
| |/
* | am 53cab935: am 1fc747d2: am 5a25a63d: Merge "Installd: Pass debuggable flag"Andreas Gampe2015-03-103-9/+23
|\ \ | |/
| * am 5a25a63d: Merge "Installd: Pass debuggable flag"Andreas Gampe2015-03-103-9/+23
| |\
| | * Installd: Pass debuggable flagAndreas Gampe2015-03-093-9/+23
* | | am f11b58f2: am fcf1689c: am 5fec7915: Merge "service_manager: reorder permis...Nick Kralevich2015-03-051-16/+14
|\ \ \ | |/ /
| * | am 5fec7915: Merge "service_manager: reorder permission checks for find"Nick Kralevich2015-03-051-16/+14
| |\ \ | | |/
| | * service_manager: reorder permission checks for findNick Kralevich2015-03-051-16/+14
* | | resolved conflicts for merge of 04e13acd to masterChristopher Ferris2015-02-263-39/+108
|\ \ \ | |/ /
| * | am 9d68ed0e: Merge "Add timeout for dump_file."Christopher Ferris2015-02-263-39/+85
| |\ \ | | |/
| | * Merge "Add timeout for dump_file."Christopher Ferris2015-02-263-39/+85
| | |\
| | | * Add timeout for dump_file.Christopher Ferris2015-02-253-39/+85
* | | | resolved conflicts for merge of d6c8ae9c to masterMark Salyzyn2015-02-261-0/+4
|\ \ \ \ | |/ / /
| * | | am bb67beca: Merge "dumpstate: add pstore read"Mark Salyzyn2015-02-261-0/+4
| |\ \ \ | | |/ /
| | * | dumpstate: add pstore readMark Salyzyn2015-02-261-0/+4
| | |/
| * | Merge commit '26cc3d0b67ff4daf31eaeed0ecd87b391978aadb' into HEADBill Yi2015-02-193-12/+39
| |\ \ | | |/ | |/|
* | | Merge "Remove unnecessary settings state dump."Svetoslav2015-02-183-48/+0
|\ \ \
| * | | Remove unnecessary settings state dump.Svetoslav2015-02-173-48/+0
| | |/ | |/|
* | | am 75b81aee: Merge "Add missing <sys/file.h> include for flock."Elliott Hughes2015-02-171-0/+1
|\ \ \ | |/ / |/| / | |/
| * Add missing <sys/file.h> include for flock.Elliott Hughes2015-02-161-0/+1
* | am 8511b3ae: Merge "Remove -z option."Christopher Ferris2015-02-103-49/+8
|\ \ | |/
| * Remove -z option.Christopher Ferris2015-02-093-49/+8
* | am 50ad67e4: Merge "Add better timeout mechanism for running commands."Christopher Ferris2015-02-041-18/+69
|\ \ | |/
| * Add better timeout mechanism for running commands.Christopher Ferris2015-02-031-18/+69
* | am 51bfedd8: Merge "Add missing includes."Elliott Hughes2015-01-302-0/+2
|\ \ | |/
| * Add missing includes.Elliott Hughes2015-01-292-0/+2
* | am 0e17a265: Merge "Switch dumpstate to "ip link list"."Elliott Hughes2015-01-281-1/+2
|\ \ | |/
| * Switch dumpstate to "ip link list".Elliott Hughes2015-01-281-1/+2
* | am 346329b7: Merge "Move atrace from the obsolete bzero to memset."Elliott Hughes2015-01-251-1/+2
|\ \ | |/
| * Merge "Move atrace from the obsolete bzero to memset."Elliott Hughes2015-01-251-1/+2
| |\
| | * Move atrace from the obsolete bzero to memset.Elliott Hughes2015-01-251-1/+2
* | | am c0e10c6f: Merge "Refactor of the bugreport code."Christopher Ferris2015-01-233-57/+94
|\ \ \ | |/ /
| * | Refactor of the bugreport code.Christopher Ferris2015-01-233-57/+94
| |/
| * Use the timeout stack dump functions.Christopher Ferris2015-01-151-5/+13
* | am 457731f6: Use the timeout stack dump functions.Christopher Ferris2015-01-151-5/+13
|\ \
| * | Use the timeout stack dump functions.Christopher Ferris2015-01-141-5/+13
| * | Fix message when a command times out.Christopher Ferris2015-01-141-1/+1
| * | Installd: Swap file for dex2oatAndreas Gampe2014-12-181-5/+61
* | | am 4f9bfffe: Merge "Fix message when a command times out."Christopher Ferris2015-01-121-1/+1
|\ \ \ | | |/ | |/|
| * | Fix message when a command times out.Christopher Ferris2015-01-091-1/+1
* | | am 96e4409e: Merge "Installd: Disallow relocation for decryption"Andreas Gampe2015-01-071-15/+24
|\ \ \ | |/ /
| * | Installd: Disallow relocation for decryptionneo.chae2015-01-071-15/+24
* | | am d3255076: Merge "Installd: Swap file for dex2oat"Andreas Gampe2014-12-221-3/+59
|\ \ \ | |/ /