summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of e78a27ca to lmp-mr1-dev-plus-aospMarco Nelissen2014-11-1755-145/+143
|\
| * am 9b77083e: Merge "Update calls to IInterface::asBinder()"Marco Nelissen2014-11-1755-145/+143
| |\
| | * Merge "Update calls to IInterface::asBinder()"Marco Nelissen2014-11-1755-145/+143
| | |\
| | | * Update calls to IInterface::asBinder()Marco Nelissen2014-11-1755-145/+143
| | |/
* | | am bb0cf4d0: am d0264109: Merge "Move libldnhncr to libc++."Dan Albert2014-11-161-1/+0
|\ \ \ | |/ /
| * | am d0264109: Merge "Move libldnhncr to libc++."Dan Albert2014-11-161-1/+0
| |\ \ | | |/
| | * Merge "Move libldnhncr to libc++."Dan Albert2014-11-161-1/+0
| | |\
| | | * Move libldnhncr to libc++.Dan Albert2014-11-151-1/+0
| | |/
* | | am addfc718: Merge "NuPlayer: tunnel decoder with renderer for data buffer pa...Wei Jia2014-11-157-124/+205
|\ \ \
| * \ \ am addfc718: Merge "NuPlayer: tunnel decoder with renderer for data buffer pa...Wei Jia2014-11-157-124/+205
| |\ \ \
| | * \ \ Merge "NuPlayer: tunnel decoder with renderer for data buffer passing." into ...Wei Jia2014-11-157-124/+205
| | |\ \ \
| | | * | | NuPlayer: tunnel decoder with renderer for data buffer passing.Wei Jia2014-11-147-124/+205
* | | | | | am f97dfbc9: Merge "PlaylistFetcher: handle sporadic fetch erros" into lmp-mr...Robert Shih2014-11-151-27/+37
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am f97dfbc9: Merge "PlaylistFetcher: handle sporadic fetch erros" into lmp-mr...Robert Shih2014-11-151-27/+37
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "PlaylistFetcher: handle sporadic fetch erros" into lmp-mr1-devRobert Shih2014-11-151-27/+37
| | |\ \ \ \
| | | * | | | PlaylistFetcher: handle sporadic fetch errosRobert Shih2014-11-131-27/+37
* | | | | | | am 0ef3210f: am 14a74010: Merge "Include AudioPolicyInterface.h only when nee...Chih-Hung Hsieh2014-11-152-0/+3
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | am 14a74010: Merge "Include AudioPolicyInterface.h only when needed."Chih-Hung Hsieh2014-11-152-0/+3
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Merge "Include AudioPolicyInterface.h only when needed."Chih-Hung Hsieh2014-11-152-0/+3
| | |\ \ \ \ \
| | | * | | | | Include AudioPolicyInterface.h only when needed.Chih-Hung Hsieh2014-11-142-0/+3
| | |/ / / / /
* | | | | | | am 339b5f77: am a82b5f57: Merge "libstagefright: use __predict_false from bio...Mark Salyzyn2014-11-150-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am a82b5f57: Merge "libstagefright: use __predict_false from bionic rather th...Mark Salyzyn2014-11-121-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "libstagefright: use __predict_false from bionic rather than CONDITION ...Mark Salyzyn2014-11-121-1/+1
| | |\ \ \ \ \
| | | * | | | | libstagefright: use __predict_false from bionic rather than CONDITION from lo...Mark Salyzyn2014-11-111-1/+1
| | |/ / / / /
* | | | | | | am 990dad99: Merge "remove AudioSystem::getOutputSamplingRateForAttr()" into ...Eric Laurent2014-11-143-30/+15
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | am 990dad99: Merge "remove AudioSystem::getOutputSamplingRateForAttr()" into ...Eric Laurent2014-11-143-30/+15
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge "remove AudioSystem::getOutputSamplingRateForAttr()" into lmp-mr1-devEric Laurent2014-11-143-30/+15
| | |\ \ \ \ \
| | | * | | | | remove AudioSystem::getOutputSamplingRateForAttr()Eric Laurent2014-11-123-30/+15
* | | | | | | | am 41907c44: am cede28e2: Merge "stagefright: add runtime debug support" into...Lajos Molnar2014-11-1411-440/+830
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am cede28e2: Merge "stagefright: add runtime debug support" into lmp-mr1-devLajos Molnar2014-11-1411-440/+830
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "stagefright: add runtime debug support" into lmp-mr1-devLajos Molnar2014-11-1411-440/+830
| | |\ \ \ \ \ \
| | | * | | | | | stagefright: add runtime debug supportLajos Molnar2014-11-1211-440/+830
* | | | | | | | | am 08961d0b: am 97e6ca1a: Merge "Stagefright: use MediaCodec in async mode fo...Chong Zhang2014-11-142-168/+105
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 97e6ca1a: Merge "Stagefright: use MediaCodec in async mode for recording" ...Chong Zhang2014-11-132-168/+105
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Stagefright: use MediaCodec in async mode for recording" into lmp-mr1-devChong Zhang2014-11-132-168/+105
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | | * | | | | | Stagefright: use MediaCodec in async mode for recordingPraveen Chavan2014-11-122-168/+105
| | | * | | | | | merge in lmp-mr1-release history after reset to 1cf9ad1abb599ce4057189e0db154...The Android Automerger2014-11-060-0/+0
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to ed1e55c5276a1c031e9b2f016387c...The Android Automerger2014-11-050-0/+0
| | | | |\ \ \ \ \ \
| | | | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to ed1e55c5276a1c031e9b2f016387c...The Android Automerger2014-11-040-0/+0
| | | | | |\ \ \ \ \ \ | | | | |/ / / / / / /
| | | | | * | | | | | merge in lmp-mr1-release history after reset to 151b3f41ffcdf187580542ba0c0d3...The Android Automerger2014-11-030-0/+0
| | | | | |\ \ \ \ \ \
| | | | | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to 151b3f41ffcdf187580542ba0c0d3...The Android Automerger2014-11-020-0/+0
| | | | | | |\ \ \ \ \ \ | | | | | |/ / / / / / /
| | | | | | * | | | | | merge in lmp-mr1-release history after reset to d9cfeb447356cb6334379eaf5da1e...The Android Automerger2014-11-010-0/+0
| | | | | | |\ \ \ \ \ \
| | | | | | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to 7011ee31d65917a9e15b271942e86...The Android Automerger2014-10-300-0/+0
| | | | | | | |\ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to 6e8212b2a02685e50d0c093a6f44d...The Android Automerger2014-10-290-0/+0
| | | | | | | | |\ \ \ \ \ \
| | | | | | | | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to 701b96474dc8afd16046e440975e0...The Android Automerger2014-10-280-0/+0
| | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to 8bfa96c2f7c098550b00b84677088...The Android Automerger2014-10-270-0/+0
| | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to 8bfa96c2f7c098550b00b84677088...The Android Automerger2014-10-260-0/+0
| | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | |/ / / / / / /
| | | | | | | | | | | * | | | | | merge in lmp-mr1-release history after reset to 8bfa96c2f7c098550b00b84677088...The Android Automerger2014-10-250-0/+0
| | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | |/ / / / / / /
| | | | | | | | | | | * | | | | | merge in lmp-mr1-release history after reset to b9b21bc11bfb6e77cc0f9e9a31de0...The Android Automerger2014-10-230-0/+0
| | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to 171fa1607e8bc3e94c2c9ff080777...The Android Automerger2014-10-220-0/+0
| | | | | | | | | | | | |\ \ \ \ \ \