summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am cb6a842c: Merge "Add a stack overflow test to crasher, and document all th...Elliott Hughes2013-04-231-27/+38
|\
| * Merge "Add a stack overflow test to crasher, and document all the options."Elliott Hughes2013-04-241-27/+38
| |\
| | * Add a stack overflow test to crasher, and document all the options.Elliott Hughes2013-04-231-27/+38
* | | am b73a0ef4: Merge "use lseek64 to resolve offset oveflow"Colin Cross2013-04-181-4/+4
|\ \ \ | |/ /
| * | Merge "use lseek64 to resolve offset oveflow"Colin Cross2013-04-181-4/+4
| |\ \
| | * | use lseek64 to resolve offset oveflowJongrak Kwon2013-04-171-4/+4
| | |/
* | | am b3478f4a: Merge "Fix regression: log mem maps around native fault address"...Christopher Tate2013-04-181-10/+11
|\ \ \
| * \ \ Merge "Fix regression: log mem maps around native fault address" into jb-mr2-devChristopher Tate2013-04-181-10/+11
| |\ \ \
| | * | | Fix regression: log mem maps around native fault addressChristopher Tate2013-04-181-10/+11
* | | | | am ca0cb785: Merge "graphics: add Android flexible YCbCr format" into jb-mr2-devAlex Ray2013-04-181-0/+54
|\ \ \ \ \ | |/ / / /
| * | | | Merge "graphics: add Android flexible YCbCr format" into jb-mr2-devAlex Ray2013-04-181-0/+54
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | graphics: add Android flexible YCbCr formatAlex Ray2013-04-091-0/+54
* | | | | am d7cab8bf: Merge "adb : add missing connection states"Colin Cross2013-04-171-0/+4
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge "adb : add missing connection states"Colin Cross2013-04-171-0/+4
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | adb : add missing connection statestrevd2013-04-171-0/+4
* | | | | am ffc5a4a5: Merge "Add OUYA VID to known VID list"Elliott Hughes2013-04-171-0/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Add OUYA VID to known VID list"Elliott Hughes2013-04-171-0/+3
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Add OUYA VID to known VID listAl Sutton2013-04-171-0/+3
| |/ / /
* | | | am 25538257: Merge "cutils: add a way to disable tracing for a process" into ...Jamie Gennis2013-04-162-12/+36
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "cutils: add a way to disable tracing for a process" into jb-mr2-devJamie Gennis2013-04-162-12/+36
| |\ \ \
| | * | | cutils: add a way to disable tracing for a processJamie Gennis2013-04-152-12/+36
* | | | | am ebcf93e3: Add logic to fixup file contexts after a policy update.Geremy Condra2013-04-151-1/+6
|\ \ \ \ \ | |/ / / /
| * | | | Add logic to fixup file contexts after a policy update.Geremy Condra2013-04-151-1/+6
* | | | | am ebbe9807: Include liblog in fs_mgr to fix the build.Ken Sumrall2013-04-151-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Include liblog in fs_mgr to fix the build.Ken Sumrall2013-04-151-1/+1
* | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-04-150-0/+0
|\ \ \ \ \
| * \ \ \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-150-0/+0
| |\ \ \ \ \
* | \ \ \ \ \ am 1a6d9ec2: Merge "fs_mgr: Capture the output of e2fsck and add to the kerne...Ken Sumrall2013-04-153-19/+18
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge "fs_mgr: Capture the output of e2fsck and add to the kernel log" into j...Ken Sumrall2013-04-153-19/+18
| |\ \ \ \ \ \
| | * | | | | | fs_mgr: Capture the output of e2fsck and add to the kernel logKen Sumrall2013-04-143-19/+18
* | | | | | | | am 1f75eb1e: Merge "logwrapper: Add ability to log to kernel log" into jb-mr2...Ken Sumrall2013-04-154-46/+371
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "logwrapper: Add ability to log to kernel log" into jb-mr2-devKen Sumrall2013-04-154-46/+371
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | logwrapper: Add ability to log to kernel logKen Sumrall2013-04-144-46/+371
* | | | | | | | am 774814d1: Merge "klog: Have klog_write() call klog_init() if needed" into ...Ken Sumrall2013-04-152-1/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "klog: Have klog_write() call klog_init() if needed" into jb-mr2-devKen Sumrall2013-04-152-1/+10
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | / / / / / | | |/ / / / / | |/| | | | |
| | * | | | | klog: Have klog_write() call klog_init() if neededKen Sumrall2013-04-112-1/+10
| | | |/ / / | | |/| | |
* | | | | | am 24bc41b7: Add new resources trace.Dianne Hackborn2013-04-121-1/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Add new resources trace.Dianne Hackborn2013-04-121-1/+2
| |/ / / /
* | | | | am c796ed97: We need libcutils to include liblogYing Wang2013-04-111-1/+3
|\ \ \ \ \ | |/ / / /
| * | | | We need libcutils to include liblogYing Wang2013-04-101-1/+3
* | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-04-100-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-100-0/+0
| |\ \ \ \ | | |/ / / | |/| | |
* | | | | am 083b5ccb: Add liblogYing Wang2013-04-097-11/+14
|\ \ \ \ \ | |/ / / /
| * | | | Add liblogYing Wang2013-04-097-11/+14
| | |_|/ | |/| |
* | | | 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 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