Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge tag 'android-6.0.0_r26' into cm-13.0 | Ricardo Cerqueira | 2015-11-05 | 75 | -658/+1297 |
|\ | |||||
| * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-10-08 | 0 | -0/+0 |
| |\ | |||||
| | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-10-07 | 0 | -0/+0 |
| | |\ | |||||
| | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-10-06 | 0 | -0/+0 |
| | | |\ | |||||
| | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-10-04 | 0 | -0/+0 |
| | | | |\ | |||||
| | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-10-02 | 0 | -0/+0 |
| | | | | |\ | |||||
| | | | | | * | CameraService: Use SCHED_FIFO for request queue thread in HFR | Eino-Ville Talvala | 2015-09-26 | 10 | -16/+25 |
| | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-09-24 | 0 | -0/+0 |
| | | | | | |\ | |||||
| | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-09-22 | 0 | -0/+0 |
| | | | | | | |\ | |||||
| | | | | | | | * | 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-17 | 0 | -0/+0 |
| | | | | | | | | |\ | |||||
| | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-09-16 | 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-14 | 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 |
| | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | * | Revert "Do not acknowledge flush() on start() for static tracks" | Eric Laurent | 2015-09-09 | 1 | -6/+3 |
| | | | | | | | | | | | | | | * | 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 |
| | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-09-03 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-31 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-29 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-29 | 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-24 | 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-20 | 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-18 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | |\ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | * \ | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-16 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | * \ | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-15 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-13 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-12 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-11 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-09 | 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-08-06 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-05 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-01 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-07-30 | 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-23 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | SoftAVCDec: init decoder using updated size | Chong Zhang | 2015-07-21 | 1 | -0/+2 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "AudioTrack: Prevent stop() from reissuing last marker event" into mnc-... | Glenn Kasten | 2015-10-07 | 1 | -3/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioTrack: Prevent stop() from reissuing last marker event | Andy Hung | 2015-10-06 | 1 | -3/+12 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 5dcef419: am a6b9d752: am d4df7559: am 39f64a1e: am 8b713f11: am b75a78db:... | Wei Jia | 2015-10-06 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am a6b9d752: am d4df7559: am 39f64a1e: am 8b713f11: am b75a78db: am fc0e2a87:... | Wei Jia | 2015-10-06 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am d4df7559: am 39f64a1e: am 8b713f11: am b75a78db: am fc0e2a87: am 7ed8d1ef:... | Wei Jia | 2015-10-06 | 1 | -2/+19 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |