summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 129b6d90: am 083b5ccb: Add liblogYing Wang2013-04-097-11/+14
|\
| * am 083b5ccb: Add liblogYing Wang2013-04-097-11/+14
| |\
| | * Add liblogYing Wang2013-04-097-11/+14
* | | am 2e1be175: Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-04-080-0/+0
|\ \ \ | |/ /
| * | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-04-080-0/+0
| |\ \
| | * \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-080-0/+0
| | |\ \ | | | |/ | | |/|
| | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-040-0/+0
| | | |\
* | | | \ am dd0a6cdf: am 578b7473: Merge "libsparse: Fix null pointer issue"Colin Cross2013-04-061-0/+3
|\ \ \ \ \ | |/ / / /
| * | | | am 578b7473: Merge "libsparse: Fix null pointer issue"Colin Cross2013-04-061-0/+3
| |\ \ \ \
| | * \ \ \ Merge "libsparse: Fix null pointer issue"Colin Cross2013-04-061-0/+3
| | |\ \ \ \
| | | * | | | libsparse: Fix null pointer issueHong-Mei Li2013-04-011-0/+3
* | | | | | | am d3859e43: am 6e0b9ecb: Merge "toolbox/dmesg: do not hardcode KLOG_BUF_LEN"Colin Cross2013-04-061-6/+21
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 6e0b9ecb: Merge "toolbox/dmesg: do not hardcode KLOG_BUF_LEN"Colin Cross2013-04-061-6/+21
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "toolbox/dmesg: do not hardcode KLOG_BUF_LEN"Colin Cross2013-04-061-6/+21
| | |\ \ \ \ \
| | | * | | | | toolbox/dmesg: do not hardcode KLOG_BUF_LENJames Sullins2013-04-011-6/+21
| | | |/ / / /
* | | | | | | am a5ca229a: am 1615c09a: Merge "init: Fix potential null pointer issue"Colin Cross2013-04-051-9/+9
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 1615c09a: Merge "init: Fix potential null pointer issue"Colin Cross2013-04-051-9/+9
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "init: Fix potential null pointer issue"Colin Cross2013-04-061-9/+9
| | |\ \ \ \ \
| | | * | | | | init: Fix potential null pointer issueHong-Mei Li2013-04-011-9/+9
| | | |/ / / /
* | | | | | | am 2c170667: am 7716aef1: Uploaded native crash dumps do not include memory c...Christopher Tate2013-04-057-98/+114
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 7716aef1: Uploaded native crash dumps do not include memory contentsChristopher Tate2013-04-057-98/+114
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Uploaded native crash dumps do not include memory contentsChristopher Tate2013-04-057-98/+114
* | | | | | | am c3d750b7: am e5f8a692: Modify debuggerd to cope with the abort message.Elliott Hughes2013-04-050-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am e5f8a692: Modify debuggerd to cope with the abort message.Elliott Hughes2013-04-050-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Modify debuggerd to cope with the abort message.Elliott Hughes2013-04-054-12/+54
* | | | | | | am 8a4ae0a8: resolved conflicts for merge of f79c0518 to jb-mr2-dev-plus-aospElliott Hughes2013-04-054-12/+54
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | resolved conflicts for merge of f79c0518 to jb-mr2-dev-plus-aospElliott Hughes2013-04-054-12/+54
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge "Modify debuggerd to cope with the abort message."Elliott Hughes2013-04-054-12/+54
| | |\ \ \ \ \
| | | * | | | | Modify debuggerd to cope with the abort message.Elliott Hughes2013-04-044-12/+54
* | | | | | | | am c307aa5f: am b4d52a43: Only handle keycodes when adb is enabled.Jeff Sharkey2013-04-051-6/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am b4d52a43: Only handle keycodes when adb is enabled.Jeff Sharkey2013-04-051-6/+2
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Only handle keycodes when adb is enabled.Jeff Sharkey2013-04-041-6/+2
| | | |_|_|/ / | | |/| | | |
* | | | | | | am ca02a136: am ad999a09: (-s ours) Merge "rootdir: goldfish: mount debugfs o...Keun-young Park2013-04-050-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am ad999a09: (-s ours) Merge "rootdir: goldfish: mount debugfs on boot time"Keun-young Park2013-04-050-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge "rootdir: goldfish: mount debugfs on boot time"Keun-young Park2013-04-051-0/+1
| | |\ \ \ \ \
| | | * | | | | rootdir: goldfish: mount debugfs on boot timeYoung-Ho Cha2013-03-101-0/+1
* | | | | | | | am a7096004: am 911ba269: Merge "Add -i option to toolbox cmd ls"Geremy Condra2013-04-041-36/+44
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 911ba269: Merge "Add -i option to toolbox cmd ls"Geremy Condra2013-04-041-36/+44
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Add -i option to toolbox cmd ls"Geremy Condra2013-04-051-36/+44
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | | * | | | | Add -i option to toolbox cmd lsWilliam Roberts2013-04-031-36/+44
| | |/ / / / /
* | | | | | | am a7672f42: Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-04-030-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-04-030-0/+0
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-030-0/+0
| | |\ \ \ \ \
| | | * \ \ \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-020-0/+0
| | | |\ \ \ \ \
* | | | \ \ \ \ \ am 76c67445: Merge "resolved conflicts for merge of 02e8d730 to jb-mr2-dev-pl...Brian Carlstrom2013-04-031-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "resolved conflicts for merge of 02e8d730 to jb-mr2-dev-plus-aosp" into...Brian Carlstrom2013-04-031-1/+1
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ resolved conflicts for merge of 02e8d730 to jb-mr2-dev-plus-aospBrian Carlstrom2013-04-031-1/+1
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | |
| | | * | | | | | | Merge "Add OkHttp to the boot classpath."Brian Carlstrom2013-04-031-1/+1
| | | |\ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | | | * | | | | | Add OkHttp to the boot classpath.jwilson2013-04-021-1/+1
| | | |/ / / / / /
* | | | | | | | | am 977e1f26: am c1e47294: Merge "Give system ownership of selinux load and en...Geremy Condra2013-04-030-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /