Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "Fix missing mutex lock in Drm::binderDied" into lmp-mr1-dev | Jeff Tinker | 2014-11-18 | 1 | -1/+5 |
|\ | |||||
| * | Fix missing mutex lock in Drm::binderDied | Jeff Tinker | 2014-11-16 | 1 | -1/+5 |
* | | Merge "Prevent stopped audio tracks from mixing data" into lmp-mr1-dev | Andy Hung | 2014-11-18 | 1 | -8/+9 |
|\ \ | |||||
| * | | Prevent stopped audio tracks from mixing data | Andy Hung | 2014-11-17 | 1 | -8/+9 |
* | | | Merge "Fix race condition in signaling completion for decode." into lmp-mr1-dev | Andy Hung | 2014-11-17 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | Fix race condition in signaling completion for decode. | Andy Hung | 2014-11-17 | 1 | -0/+1 |
| |/ / | |||||
* | | | Merge "NuPlayer HTTPLiveSource: impl getSelectedTrack" into lmp-mr1-dev | Robert Shih | 2014-11-17 | 6 | -0/+56 |
|\ \ \ | |||||
| * | | | NuPlayer HTTPLiveSource: impl getSelectedTrack | Robert Shih | 2014-11-06 | 6 | -0/+56 |
* | | | | Merge "audiopolicy: Update input device check in checkInputsForDevice" into l... | Eric Laurent | 2014-11-17 | 1 | -3/+6 |
|\ \ \ \ | |||||
| * | | | | audiopolicy: Update input device check in checkInputsForDevice | Eric Laurent | 2014-11-17 | 1 | -3/+6 |
* | | | | | Merge "CameraService: normalize face rectangles properly" into lmp-mr1-dev | Chien-Yu Chen | 2014-11-17 | 3 | -73/+90 |
|\ \ \ \ \ | |||||
| * | | | | | CameraService: normalize face rectangles properly | Chien-Yu Chen | 2014-11-13 | 3 | -73/+90 |
* | | | | | | Merge "NuPlayer: tunnel decoder with renderer for data buffer passing." into ... | Wei Jia | 2014-11-15 | 7 | -124/+205 |
|\ \ \ \ \ \ | |||||
| * | | | | | | NuPlayer: tunnel decoder with renderer for data buffer passing. | Wei Jia | 2014-11-14 | 7 | -124/+205 |
* | | | | | | | Merge "PlaylistFetcher: handle sporadic fetch erros" into lmp-mr1-dev | Robert Shih | 2014-11-15 | 1 | -27/+37 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | PlaylistFetcher: handle sporadic fetch erros | Robert Shih | 2014-11-13 | 1 | -27/+37 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge "remove AudioSystem::getOutputSamplingRateForAttr()" into lmp-mr1-dev | Eric Laurent | 2014-11-14 | 3 | -30/+15 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | remove AudioSystem::getOutputSamplingRateForAttr() | Eric Laurent | 2014-11-12 | 3 | -30/+15 |
* | | | | | | | | Merge "stagefright: add runtime debug support" into lmp-mr1-dev | Lajos Molnar | 2014-11-14 | 11 | -440/+830 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | stagefright: add runtime debug support | Lajos Molnar | 2014-11-12 | 11 | -440/+830 |
* | | | | | | | | Merge "Stagefright: use MediaCodec in async mode for recording" into lmp-mr1-dev | Chong Zhang | 2014-11-13 | 2 | -168/+105 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Stagefright: use MediaCodec in async mode for recording | Praveen Chavan | 2014-11-12 | 2 | -168/+105 |
| * | | | | | | | merge in lmp-mr1-release history after reset to 1cf9ad1abb599ce4057189e0db154... | The Android Automerger | 2014-11-06 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| | * | | | | | | merge in lmp-mr1-release history after reset to ed1e55c5276a1c031e9b2f016387c... | The Android Automerger | 2014-11-05 | 0 | -0/+0 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | merge in lmp-mr1-release history after reset to ed1e55c5276a1c031e9b2f016387c... | The Android Automerger | 2014-11-04 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ | | |/ / / / / / / | |||||
| | | * | | | | | | merge in lmp-mr1-release history after reset to 151b3f41ffcdf187580542ba0c0d3... | The Android Automerger | 2014-11-03 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | merge in lmp-mr1-release history after reset to 151b3f41ffcdf187580542ba0c0d3... | The Android Automerger | 2014-11-02 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ | | | |/ / / / / / / | |||||
| | | | * | | | | | | merge in lmp-mr1-release history after reset to d9cfeb447356cb6334379eaf5da1e... | The Android Automerger | 2014-11-01 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ | merge in lmp-mr1-release history after reset to 7011ee31d65917a9e15b271942e86... | The Android Automerger | 2014-10-30 | 0 | -0/+0 |
| | | | | |\ \ \ \ \ \ | |||||
| | | | | | * \ \ \ \ \ | merge in lmp-mr1-release history after reset to 6e8212b2a02685e50d0c093a6f44d... | The Android Automerger | 2014-10-29 | 0 | -0/+0 |
| | | | | | |\ \ \ \ \ \ | |||||
| | | | | | | * \ \ \ \ \ | merge in lmp-mr1-release history after reset to 701b96474dc8afd16046e440975e0... | The Android Automerger | 2014-10-28 | 0 | -0/+0 |
| | | | | | | |\ \ \ \ \ \ | |||||
| | | | | | | | * \ \ \ \ \ | merge in lmp-mr1-release history after reset to 8bfa96c2f7c098550b00b84677088... | The Android Automerger | 2014-10-27 | 0 | -0/+0 |
| | | | | | | | |\ \ \ \ \ \ | |||||
| | | | | | | | | * \ \ \ \ \ | merge in lmp-mr1-release history after reset to 8bfa96c2f7c098550b00b84677088... | The Android Automerger | 2014-10-26 | 0 | -0/+0 |
| | | | | | | | | |\ \ \ \ \ \ | | | | | | | | |/ / / / / / / | |||||
| | | | | | | | | * | | | | | | merge in lmp-mr1-release history after reset to 8bfa96c2f7c098550b00b84677088... | The Android Automerger | 2014-10-25 | 0 | -0/+0 |
| | | | | | | | | |\ \ \ \ \ \ | | | | | | | | |/ / / / / / / | |||||
| | | | | | | | | * | | | | | | merge in lmp-mr1-release history after reset to b9b21bc11bfb6e77cc0f9e9a31de0... | The Android Automerger | 2014-10-23 | 0 | -0/+0 |
| | | | | | | | | |\ \ \ \ \ \ | |||||
| | | | | | | | | | * \ \ \ \ \ | merge in lmp-mr1-release history after reset to 171fa1607e8bc3e94c2c9ff080777... | The Android Automerger | 2014-10-22 | 0 | -0/+0 |
| | | | | | | | | | |\ \ \ \ \ \ | |||||
| | | | | | | | | | | * \ \ \ \ \ | merge in lmp-mr1-release history after reset to d61ba0aae5c3155a3e232490129f9... | The Android Automerger | 2014-10-21 | 0 | -0/+0 |
| | | | | | | | | | | |\ \ \ \ \ \ | |||||
| | | | | | | | | | | | * \ \ \ \ \ | merge in lmp-mr1-release history after reset to dfe7616237240e8a5c4cb26ba395b... | The Android Automerger | 2014-10-20 | 0 | -0/+0 |
| | | | | | | | | | | | |\ \ \ \ \ \ | |||||
| | | | | | | | | | | | | * \ \ \ \ \ | merge in lmp-mr1-release history after reset to dfe7616237240e8a5c4cb26ba395b... | The Android Automerger | 2014-10-19 | 0 | -0/+0 |
| | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | |/ / / / / / / | |||||
| | | | | | | | | | | | | * | | | | | | merge in lmp-mr1-release history after reset to dfe7616237240e8a5c4cb26ba395b... | The Android Automerger | 2014-10-18 | 0 | -0/+0 |
| | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | |/ / / / / / / | |||||
| | | | | | | | | | | | | * | | | | | | merge in lmp-mr1-release history after reset to 7771ebfe2457da705439b16cdb80b... | The Android Automerger | 2014-10-16 | 0 | -0/+0 |
| | | | | | | | | | | | | |\ \ \ \ \ \ | |||||
| | | | | | | | | | | | | | * \ \ \ \ \ | merge in lmp-mr1-release history after reset to fc1d3da510310ce72aee8a68f103e... | The Android Automerger | 2014-10-15 | 0 | -0/+0 |
| | | | | | | | | | | | | | |\ \ \ \ \ \ | |||||
| | | | | | | | | | | | | | | * \ \ \ \ \ | merge in lmp-mr1-release history after reset to 45b944024edde49c27371c7323627... | The Android Automerger | 2014-10-14 | 0 | -0/+0 |
| | | | | | | | | | | | | | | |\ \ \ \ \ \ | |||||
| | | | | | | | | | | | | | | | * \ \ \ \ \ | merge in lmp-mr1-release history after reset to 0f69763d41c101a2afcac7f10be86... | The Android Automerger | 2014-10-13 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | |\ \ \ \ \ \ | |||||
| | | | | | | | | | | | | | | | | * \ \ \ \ \ | merge in lmp-mr1-release history after reset to d763561844c4f1c45703f25a37b8f... | The Android Automerger | 2014-10-12 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | |\ \ \ \ \ \ | |||||
| | | | | | | | | | | | | | | | | | * \ \ \ \ \ | merge in lmp-mr1-release history after reset to d763561844c4f1c45703f25a37b8f... | The Android Automerger | 2014-10-11 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | |/ / / / / / / | |||||
| | | | | | | | | | | | | | | | | | * | | | | | | audio policy: move intializations to onFirstRef() | Eric Laurent | 2014-10-10 | 2 | -0/+7 |
| | | | | | | | | | | | | | | | | | * | | | | | | merge in lmp-mr1-release history after reset to 58202e1d7e4d244e1d93699c840d2... | The Android Automerger | 2014-10-09 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ | |||||
| | | | | | | | | | | | | | | | | | | * \ \ \ \ \ | merge in lmp-mr1-release history after reset to 58202e1d7e4d244e1d93699c840d2... | The Android Automerger | 2014-10-08 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | |/ / / / / / / | |||||
| | | | | | | | | | | | | | | | | | | * | | | | | | merge in lmp-mr1-release history after reset to 1318a60824c4f787e54fbbc8a388c... | The Android Automerger | 2014-10-07 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ |