summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* make_ext4fs: fix static utility executable, this time for SELinuxcm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1Chirayu Desai2013-07-231-0/+5
* Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/sys...cm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1-M3cm-10.1-M2mr1.1-stagingSteve Kondik2013-02-122-7/+47
|\
| * am c04808a5: make_ext4fs: fix sepolicy lookup for lost+foundColin Cross2012-12-181-4/+8
| |\
| | * make_ext4fs: fix sepolicy lookup for lost+foundColin Cross2012-12-111-4/+8
| * | am 0f92e16a: make_ext4fs: insert lost+found directory into filled filesystemsColin Cross2012-12-181-5/+41
| |\|
| | * make_ext4fs: insert lost+found directory into filled filesystemsColin Cross2012-12-111-5/+41
| * | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-11-290-0/+0
| |\ \
| * \ \ am 430b67d3: make_ext4fs: fix dentry padding when dentry size is 4088 or 4092Colin Cross2012-11-290-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | make_ext4fs: fix dentry padding when dentry size is 4088 or 4092Colin Cross2012-11-271-10/+2
| * | | make_ext4fs: fix dentry padding when dentry size is 4088 or 4092Colin Cross2012-11-281-10/+2
| * | | Use updated stop supplicant APIIrfan Sheriff2012-11-061-2/+2
| | | |
| | \ \
| *-. \ \ Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger2012-10-120-0/+0
| | |\ \ \
* | | \ \ \ Merge commit 'android-4.2.1_r1.2' into cm-10.1Ricardo Cerqueira2013-02-021-10/+2
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | make_ext4fs: fix dentry padding when dentry size is 4088 or 4092Colin Cross2012-11-291-10/+2
| | |_|_|/ | |/| | |
* | | | | make_ext4fs: fix static utility executablecm-10.1-M1Chirayu Desai2012-11-221-1/+6
* | | | | Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/sy...Steve Kondik2012-11-1831-2186/+568
|\| | | |
| * | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-190-0/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-110-0/+0
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-070-0/+0
| | | |\
| | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-050-0/+0
| | | | |\
| | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-300-0/+0
| | | | | |\
| | | | | | * Build bugreport paths for emulated storage.Jeff Sharkey2012-09-121-5/+6
| | | | | | * Always read bugreports from EXTERNAL_STORAGE.Jeff Sharkey2012-09-121-5/+2
| | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-050-0/+0
| | | | | | |\
| | | | | | | * Don't use intent chooserGuang Zhu2012-08-231-2/+1
| | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-230-0/+0
| | | | | | | |\
| | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-220-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-200-0/+0
| | | | | | | | | |\
| | | | | | | | | | * Revert "sendbug improvements on email address handling"The Android Automerger2012-08-171-39/+19
| | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-140-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * sendbug improvements on email address handlingGuang Zhu2012-08-131-19/+39
| * | | | | | | | | | | atrace: add sync trace supportErik Gilling2012-10-171-1/+26
| |/ / / / / / / / / /
| * / / / / / / / / / Add -n and -S options for 'nohup', offline tracesGlenn Kasten2012-10-081-2/+18
| |/ / / / / / / / /
| * / / / / / / / / atrace: make clock & bus bw tracing optionalJamie Gennis2012-10-051-18/+23
| |/ / / / / / / /
| * / / / / / / / atrace: add clock rate and bus utilizationErik Gilling2012-10-041-8/+39
| |/ / / / / / /
| * | | | | | | More Issue #7211769: Crash dialog from background user has non-working "report"Dianne Hackborn2012-09-281-2/+3
| * | | | | | | Build bugreport paths for emulated storage.Jeff Sharkey2012-09-121-5/+6
| * | | | | | | Always read bugreports from EXTERNAL_STORAGE.Jeff Sharkey2012-09-121-5/+2
| |/ / / / / /
| * | | | | | Guard against NPE in SendBugGuang Zhu2012-09-041-21/+29
| * | | | | | Don't use intent chooserGuang Zhu2012-08-231-2/+1
| |/ / / / /
| * | | | | Merge "Update emmc perf test tool" into jb-mr1-devKen Sumrall2012-08-222-4/+37
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Update emmc perf test toolKen Sumrall2012-08-222-4/+37
| | |/ / /
| * / / / Explicitly use an intent chooser for sending bugreportGuang Zhu2012-08-171-0/+1
| |/ / /
| * | | am 7793c09e: Merge changes I4e94b8b9,Iae48d489Joe Onorato2012-08-171-80/+78
| |\ \ \
| | * \ \ Merge changes I4e94b8b9,Iae48d489Joe Onorato2012-08-161-80/+78
| | |\ \ \
| | | * | | Support for multiple modules with the same name is going away.Joe Onorato2012-08-151-8/+26
| | | * | | Support for multiple modules with the same name is going away.Joe Onorato2012-08-151-76/+56
| | |/ / /
| * | | | Merge "Support custom path when saving bugreports." into jb-mr1-devJeff Sharkey2012-08-162-40/+51
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Support custom path when saving bugreports.Jeff Sharkey2012-08-162-40/+51