summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-6.0.0_r26' into cm-13.0Ricardo Cerqueira2015-11-0523-142/+587
|\
| * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-240-0/+0
| |\
| | * add system-background cpusetTim Murray2015-09-211-0/+14
| | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-200-0/+0
| | |\
| | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-150-0/+0
| | | |\
| | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-130-0/+0
| | | | |\
| | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-100-0/+0
| | | | | |\
| | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-090-0/+0
| | | | | | |\
| | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-060-0/+0
| | | | | | | |\
| | | | | | | | * Add zygote to the foreground cpuset.Tim Murray2015-09-024-2/+6
| | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-020-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-270-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-250-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-220-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-190-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-080-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-290-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-250-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-220-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-180-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-160-0/+0
| | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-150-0/+0
| | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | * 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-110-0/+0
| | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-090-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | * Revert "Change init sequence to support file level encryption"Paul Lawrence2015-07-076-15/+17
| | | | | | | | | | | | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\
| * | | | | | | | | | | | | | | | | | | | | | | | | fs_mgr: trigger dm-verity error handling for invalid signaturesSami Tolvanen2015-09-221-7/+47
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge "add system-background cpuset" into mnc-dr-devTim Murray2015-09-211-0/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | add system-background cpusetTim Murray2015-09-181-0/+14
| | |/ / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | am 3f7a33a5: am 26d47f26: (-s ours) am 491035ce: am 8253cb04: am 0cc468dc: am...Narayan Kamath2015-09-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 26d47f26: (-s ours) am 491035ce: am 8253cb04: am 0cc468dc: am fef9dffd: (-...Narayan Kamath2015-09-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 491035ce: am 8253cb04: am 0cc468dc: am fef9dffd: (-s ours) am 6c53de92: Fo...Narayan Kamath2015-09-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8253cb04: am 0cc468dc: am fef9dffd: (-s ours) am 6c53de92: Follow up to ch...Narayan Kamath2015-09-170-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 0cc468dc: am fef9dffd: (-s ours) am 6c53de92: Follow up to change b638126e...Narayan Kamath2015-09-120-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am fef9dffd: (-s ours) am 6c53de92: Follow up to change b638126ed DO NOT MERGE.Narayan Kamath2015-09-120-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6c53de92: Follow up to change b638126ed DO NOT MERGE.Narayan Kamath2015-09-112-9/+4
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | Follow up to change b638126ed DO NOT MERGE.Narayan Kamath2015-09-102-9/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am dd0932e8: am 81b428f2: am db7d8e96: am 68a78370: am 2e64e959: am a82d6dc3:...Narayan Kamath2015-09-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 81b428f2: am db7d8e96: am 68a78370: am 2e64e959: am a82d6dc3: (-s ours) re...Narayan Kamath2015-09-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am db7d8e96: am 68a78370: am 2e64e959: am a82d6dc3: (-s ours) resolved confli...Narayan Kamath2015-09-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | am 68a78370: am 2e64e959: am a82d6dc3: (-s ours) resolved conflicts for b6381...Narayan Kamath2015-09-170-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | am 2e64e959: am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-mo...Narayan Kamath2015-09-120-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-modular-devNarayan Kamath2015-09-120-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / /
| | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for b638126e to klp-modular-devNarayan Kamath2015-09-1018-2188/+155
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / /
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | libutils: Fix integer overflows in VectorImpl. DO NOT MERGENarayan Kamath2015-09-0918-2188/+154
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 110f705e: resolved conflicts for 832a0d1c to mnc-devBrian Carlstrom2015-09-201-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | / / / / / / / / / / / / / / / / / / / / / / / | | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for 832a0d1c to mnc-devBrian Carlstrom2015-09-191-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for cf676a86 to lmp-mr1-ub-devBrian Carlstrom2015-09-1917-2191/+149
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / /