summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* ext4_utils: Fix warning when compiling C++ codeHEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001stable/cm-13.0-ZNH5Ycm-13.0Tom Marshall2016-07-121-0/+2
* verity: Split the signer arguments correctlyRicardo Cerqueira2016-07-111-1/+1
* verity: Let the tools ask for a password if neededRicardo Cerqueira2016-07-043-3/+24
* f2fs_utils: Update for f2fs-tools 1.6.1luca0204002016-04-122-9/+11
* f2fs_utils: Alloc f2fs_journalluca0204002016-04-121-0/+10
* Revert "f2fs_utils: Update for f2fs-tools 1.6.1"Ethan Chen2016-04-112-11/+9
* f2fs_utils: Update for f2fs-tools 1.6.1luca0204002016-04-042-9/+11
* Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/sy...staging/cm-13.0+r22stable/cm-13.0-ZNH2KBSteve Kondik2016-03-1010-30/+932
|\
| * Fix showmap SIGSEGV.Elliott Hughes2015-12-081-1/+1
| * librank: fix pm_memusage_t init and layoutThierry Strudel2015-12-081-3/+4
| * Showmap: show swap.Martijn Coenen2015-12-041-6/+12
| * procrank: add proportional swap accountingThierry Strudel2015-11-305-17/+256
| * procrank: Fix some printf alignementsThierry Strudel2015-11-201-2/+2
| * Swap column in procrank not reported with swap enabledYu Liu2015-11-202-2/+3
| * am e7863296: DO NOT MERGE Update rand_emmc_perf makefile. am: 3c1f6644bf -s ...Joshua Schwarz2015-10-150-0/+0
| |\
| | * DO NOT MERGE Update rand_emmc_perf makefile.Joshua Schwarz2015-10-150-0/+0
| | |\
| | | * DO NOT MERGE Update rand_emmc_perf makefile.Joshua Schwarz2015-10-141-0/+5
| * | | am d258e0fd: am 83eeed92: emmc test: fix counter overflowAndriy Naborskyy2015-10-151-2/+2
| |\| |
| | * | am 83eeed92: emmc test: fix counter overflowAndriy Naborskyy2015-10-151-2/+2
| | |\ \
| * | | | Prepare for BoringSSL update.Adam Langley2015-10-021-1/+1
| |/ / /
| * | | am 79e1e6bf: am dafe7076: 64bit emmc fixGopinath2015-09-151-0/+1
| |\ \ \
| * \ \ \ am 58cd4204: am c7d19e4d: Adding 64 bit emmc_rand_perfGopinath2015-08-261-0/+4
| |\ \ \ \
| * \ \ \ \ am dd22cb33: Actually encrypt stuffPaul Lawrence2015-07-161-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ am 65df483a: Don\'t encrypt lost+foundPaul Lawrence2015-07-151-2/+8
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am 96f2bc51: am e7da7e9b: Simpleperf: remove abort in child process.Yabin Cui2015-07-131-2/+3
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am fa584713: Merge changes If63f439d,I697ec4ef into mnc-dr-devPaul Crowley2015-07-133-6/+13
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am d3548a38: Merge "Add e4crypt_set_user_crypto_policies, calls vdc setusercr...Paul Crowley2015-07-132-0/+11
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am ccaca5cb: Merge "Don\'t apply default encryption to /data/user, it should ...Paul Crowley2015-07-132-0/+6
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am b89e81dc: fs_config: align with new explicit fs_config target_out parameterThierry Strudel2015-07-107-19/+43
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am b1f954d1: Merge "Add a system tool - ANRdaemon" into cw-d-mr1-devZhengyin Qian2015-07-072-0/+655
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge "Add a system tool - ANRdaemon" into cw-d-mr1-devZhengyin Qian2015-07-072-0/+655
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Add a system tool - ANRdaemonZhengyin Qian2015-07-062-0/+655
* | | | | | | | | | | | | | Fix memory leak of dirbuf.Chih-Hung Hsieh2016-02-141-0/+1
* | | | | | | | | | | | | | fix bug in mkf2fs tool calculation of f2fs filesystem lengthlei wang wang2016-01-211-1/+1
* | | | | | | | | | | | | | bootsignature: includes dt image size for signed boot imagestable/cm-13.0-ZNH0EAnkit Gupta2016-01-061-1/+3
* | | | | | | | | | | | | | Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/sys...Steve Kondik2015-12-071-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | emmc test: fix counter overflowAndriy Naborskyy2015-10-151-2/+2
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | am dafe7076: 64bit emmc fixGopinath2015-09-151-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| | * | | | | | | | | | | 64bit emmc fixGopinath2015-09-151-0/+1
* | | | | | | | | | | | | ext4_utils: ifdef socket loopbryan28942015-11-071-0/+2
* | | | | | | | | | | | | mkimage for OMAPKoushik Dutta2015-11-054-0/+1102
* | | | | | | | | | | | | Merge tag 'android-6.0.0_r26' into cm-13.0Ricardo Cerqueira2015-11-056-8/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | 64bit emmc fixGopinath2015-09-151-0/+1
| * | | | | | | | | | | | | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Actually encrypt stuffPaul Lawrence2015-07-161-1/+1
| | * | | | | | | | | | | | Don't encrypt lost+foundPaul Lawrence2015-07-151-2/+8
| | * | | | | | | | | | | | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-140-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-130-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-110-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / / / | | | | |/| | | | | | | | |
| | | | | * | | | | | | | | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-060-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / / / | | | | | |/| | | | | | | |