summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 26d92768: am 34c55e3e: Merge "No need to #include atomic-inline.h if you h...Elliott Hughes2014-11-171-1/+0
|\
| * am 34c55e3e: Merge "No need to #include atomic-inline.h if you have atomic.h."Elliott Hughes2014-11-171-1/+0
| |\
| | * Merge "No need to #include atomic-inline.h if you have atomic.h."Elliott Hughes2014-11-171-1/+0
| | |\
| | | * No need to #include atomic-inline.h if you have atomic.h.Elliott Hughes2014-11-171-1/+0
| | |/
* | | am d86450b9: am c80b9b83: Merge "Fix struct vs. class mismatches"Chih-hung Hsieh2014-11-1713-15/+14
|\ \ \ | |/ /
| * | am c80b9b83: Merge "Fix struct vs. class mismatches"Chih-hung Hsieh2014-11-1713-15/+14
| |\ \ | | |/
| | * Merge "Fix struct vs. class mismatches"Chih-hung Hsieh2014-11-1713-15/+14
| | |\
| | | * Fix struct vs. class mismatchesBernhard Rosenkränzer2014-11-1713-15/+14
* | | | am 2716969d: resolved conflicts for merge of 3bc345f5 to stage-aosp-masterElliott Hughes2014-11-172-19/+0
|\ \ \ \ | |/ / /
| * | | resolved conflicts for merge of 3bc345f5 to stage-aosp-masterElliott Hughes2014-11-172-19/+0
| |\ \ \ | | |/ /
| | * | Merge "libcutils no longer requires that its users configure ANDROID_SMP."Elliott Hughes2014-11-172-9/+0
| | |\ \ | | | |/ | | |/|
| | | * libcutils no longer requires that its users configure ANDROID_SMP.Elliott Hughes2014-11-172-9/+0
| | |/
* | | am 771a362d: am 3171f4e1: Merge "CameraService: normalize face rectangles pro...Chien-Yu Chen2014-11-173-73/+90
|\ \ \
| * \ \ am 3171f4e1: Merge "CameraService: normalize face rectangles properly" into l...Chien-Yu Chen2014-11-173-73/+90
| |\ \ \
| | * \ \ Merge "CameraService: normalize face rectangles properly" into lmp-mr1-devChien-Yu Chen2014-11-173-73/+90
| | |\ \ \
| | | * | | CameraService: normalize face rectangles properlyChien-Yu Chen2014-11-133-73/+90
* | | | | | 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
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /