Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | init: Allow devices to use user-space tools to set ro.serialno | Christopher R. Palmer | 2015-11-07 | 2 | -0/+6 |
* | init: add detection of charging mode | Pawit Pornkitprasan | 2015-11-05 | 2 | -1/+28 |
* | camera: Add L-compatible camera feature enums | Steve Kondik | 2015-11-05 | 1 | -0/+16 |
* | Merge tag 'android-6.0.0_r26' into cm-13.0 | Ricardo Cerqueira | 2015-11-05 | 23 | -142/+587 |
|\ | |||||
| * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-09-24 | 0 | -0/+0 |
| |\ | |||||
| | * | add system-background cpuset | Tim Murray | 2015-09-21 | 1 | -0/+14 |
| | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-09-20 | 0 | -0/+0 |
| | |\ | |||||
| | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-09-15 | 0 | -0/+0 |
| | | |\ | |||||
| | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-09-13 | 0 | -0/+0 |
| | | | |\ | |||||
| | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-09-10 | 0 | -0/+0 |
| | | | | |\ | |||||
| | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-09-09 | 0 | -0/+0 |
| | | | | | |\ | |||||
| | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-09-06 | 0 | -0/+0 |
| | | | | | | |\ | |||||
| | | | | | | | * | Add zygote to the foreground cpuset. | Tim Murray | 2015-09-02 | 4 | -2/+6 |
| | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-09-02 | 0 | -0/+0 |
| | | | | | | | |\ | |||||
| | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-27 | 0 | -0/+0 |
| | | | | | | | | |\ | |||||
| | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-25 | 0 | -0/+0 |
| | | | | | | | | | |\ | |||||
| | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-22 | 0 | -0/+0 |
| | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-19 | 0 | -0/+0 |
| | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-08 | 0 | -0/+0 |
| | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-07-29 | 0 | -0/+0 |
| | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-07-25 | 0 | -0/+0 |
| | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-07-22 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-07-18 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-07-16 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-07-15 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-07-14 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-07-11 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-07-09 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | | * | Revert "Change init sequence to support file level encryption" | Paul Lawrence | 2015-07-07 | 6 | -15/+17 |
| | | | | | | | | | | | | | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-07-06 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-07-06 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | |\ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | fs_mgr: trigger dm-verity error handling for invalid signatures | Sami Tolvanen | 2015-09-22 | 1 | -7/+47 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge "add system-background cpuset" into mnc-dr-dev | Tim Murray | 2015-09-21 | 1 | -0/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | add system-background cpuset | Tim Murray | 2015-09-18 | 1 | -0/+14 |
| | |/ / / / / / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | am 3f7a33a5: am 26d47f26: (-s ours) am 491035ce: am 8253cb04: am 0cc468dc: am... | Narayan Kamath | 2015-09-20 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 26d47f26: (-s ours) am 491035ce: am 8253cb04: am 0cc468dc: am fef9dffd: (-... | Narayan Kamath | 2015-09-20 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 491035ce: am 8253cb04: am 0cc468dc: am fef9dffd: (-s ours) am 6c53de92: Fo... | Narayan Kamath | 2015-09-20 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 8253cb04: am 0cc468dc: am fef9dffd: (-s ours) am 6c53de92: Follow up to ch... | Narayan Kamath | 2015-09-17 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 0cc468dc: am fef9dffd: (-s ours) am 6c53de92: Follow up to change b638126e... | Narayan Kamath | 2015-09-12 | 0 | -0/+0 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am fef9dffd: (-s ours) am 6c53de92: Follow up to change b638126ed DO NOT MERGE. | Narayan Kamath | 2015-09-12 | 0 | -0/+0 |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 6c53de92: Follow up to change b638126ed DO NOT MERGE. | Narayan Kamath | 2015-09-11 | 2 | -9/+4 |
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | Follow up to change b638126ed DO NOT MERGE. | Narayan Kamath | 2015-09-10 | 2 | -9/+4 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am dd0932e8: am 81b428f2: am db7d8e96: am 68a78370: am 2e64e959: am a82d6dc3:... | Narayan Kamath | 2015-09-20 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 81b428f2: am db7d8e96: am 68a78370: am 2e64e959: am a82d6dc3: (-s ours) re... | Narayan Kamath | 2015-09-20 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am db7d8e96: am 68a78370: am 2e64e959: am a82d6dc3: (-s ours) resolved confli... | Narayan Kamath | 2015-09-20 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | |||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 68a78370: am 2e64e959: am a82d6dc3: (-s ours) resolved conflicts for b6381... | Narayan Kamath | 2015-09-17 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |||||
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | am 2e64e959: am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-mo... | Narayan Kamath | 2015-09-12 | 0 | -0/+0 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | |||||
| | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-modular-dev | Narayan Kamath | 2015-09-12 | 0 | -0/+0 |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / | |||||
| | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for b638126e to klp-modular-dev | Narayan Kamath | 2015-09-10 | 18 | -2188/+155 |
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / | |||||
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | libutils: Fix integer overflows in VectorImpl. DO NOT MERGE | Narayan Kamath | 2015-09-09 | 18 | -2188/+154 |