summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Clean up references to AUDIO_FORMAT_PCM_8_24_BITGlenn Kasten2013-07-102-2/+2
* am 06a4604e: am 4a5c009b: Camera2/3: As a fallback, unilaterally free old rec...Eino-Ville Talvala2013-07-082-14/+119
|\
| * am 4a5c009b: Camera2/3: As a fallback, unilaterally free old recording buffersEino-Ville Talvala2013-07-082-14/+119
| |\
| | * Camera2/3: As a fallback, unilaterally free old recording buffersEino-Ville Talvala2013-07-082-14/+119
* | | am 29196772: (-s ours) Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-07-080-0/+0
|\ \ \ | |/ /
| * | Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-07-080-0/+0
| |\ \
| | * \ merge in jb-mr2-zeroday-release history after reset to jb-mr2-devThe Android Automerger2013-07-080-0/+0
| | |\ \ | | | |/ | | |/|
* | | | am 1468dd9c: am c582fde9: resolved conflicts for merge of c158971f to stage-a...Jean-Baptiste Queru2013-07-081-1/+12
|\ \ \ \ | |/ / /
| * | | am c582fde9: resolved conflicts for merge of c158971f to stage-aosp-masterJean-Baptiste Queru2013-07-081-1/+12
| |\ \ \
| | * \ \ resolved conflicts for merge of c158971f to stage-aosp-masterJean-Baptiste Queru2013-07-081-1/+12
| | |\ \ \
| | | * \ \ Merge "Store rtsp accessunit until PLAY response parsed"Jean-Baptiste Queru2013-07-081-1/+12
| | | |\ \ \
| | | | * | | Store rtsp accessunit until PLAY response parsedYajun Zeng2013-05-131-1/+12
* | | | | | | am 8ebdfa8b: am 5de9ef20: am 365ed394: Merge "Typo in CameraParameters::set"Jean-Baptiste Queru2013-07-081-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 5de9ef20: am 365ed394: Merge "Typo in CameraParameters::set"Jean-Baptiste Queru2013-07-081-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 365ed394: Merge "Typo in CameraParameters::set"Jean-Baptiste Queru2013-07-081-1/+1
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "Typo in CameraParameters::set"Jean-Baptiste Queru2013-07-081-1/+1
| | | |\ \ \ \
| | | | * | | | Typo in CameraParameters::setYou Kim2012-12-141-1/+1
* | | | | | | | am c26ab375: am 5d2ab2a6: am 8eef093c: Merge "libstagefright: Use LOG_BASIC w...Jean-Baptiste Queru2013-07-081-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 5d2ab2a6: am 8eef093c: Merge "libstagefright: Use LOG_BASIC when use chrom...Jean-Baptiste Queru2013-07-081-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 8eef093c: Merge "libstagefright: Use LOG_BASIC when use chromium http stack"Jean-Baptiste Queru2013-07-081-1/+1
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge "libstagefright: Use LOG_BASIC when use chromium http stack"Jean-Baptiste Queru2013-07-081-1/+1
| | | |\ \ \ \ \
| | | | * | | | | libstagefright: Use LOG_BASIC when use chromium http stackXuefeng Deng2012-08-171-1/+1
* | | | | | | | | am 046d9c8d: am 06197925: am 267363ee: Merge "Prevent Media Server crash whil...Jean-Baptiste Queru2013-07-081-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 06197925: am 267363ee: Merge "Prevent Media Server crash while the Awesome...Jean-Baptiste Queru2013-07-081-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 267363ee: Merge "Prevent Media Server crash while the AwesomePlayer getBit...Jean-Baptiste Queru2013-07-081-1/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge "Prevent Media Server crash while the AwesomePlayer getBitrate return t...Jean-Baptiste Queru2013-07-081-1/+1
| | | |\ \ \ \ \ \
| | | | * | | | | | Prevent Media Server crash while the AwesomePlayer getBitrate return true wit...hovanchen2013-07-031-1/+1
* | | | | | | | | | am 9f0e0597: am 7266bc80: am ca7f1609: Merge "Prevent double disconnects in R...Jean-Baptiste Queru2013-07-081-0/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 7266bc80: am ca7f1609: Merge "Prevent double disconnects in RTSPSource"Jean-Baptiste Queru2013-07-081-0/+4
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am ca7f1609: Merge "Prevent double disconnects in RTSPSource"Jean-Baptiste Queru2013-07-081-0/+4
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Merge "Prevent double disconnects in RTSPSource"Jean-Baptiste Queru2013-07-081-0/+4
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | | * | | | | | Prevent double disconnects in RTSPSourceFredrik Rosin2013-07-011-0/+4
| | | |/ / / / / /
* | | | | | | | | Merge "Explicitly compare raw pointers to NULL"Glenn Kasten2013-07-081-18/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Explicitly compare raw pointers to NULLGlenn Kasten2013-07-021-18/+20
* | | | | | | | | | Merge "mv libcpustats from frameworks/native to frameworks/av"Glenn Kasten2013-07-086-0/+568
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | mv libcpustats from frameworks/native to frameworks/avGlenn Kasten2013-06-186-0/+568
* | | | | | | | | | | am 9a25c012: am eced745a: Merge "Part of fix for TEE resource leaks when app ...Jeff Tinker2013-07-072-1/+19
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | am eced745a: Merge "Part of fix for TEE resource leaks when app crashes" into...Jeff Tinker2013-07-072-1/+19
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| | * | | | | | | | | Merge "Part of fix for TEE resource leaks when app crashes" into jb-mr2-devJeff Tinker2013-07-072-1/+19
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Part of fix for TEE resource leaks when app crashesJeff Tinker2013-07-032-1/+19
* | | | | | | | | | | | am ace2378c: am f59a4b39: fix scheduling policy service death detectionEric Laurent2013-07-032-13/+31
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am f59a4b39: fix scheduling policy service death detectionEric Laurent2013-07-032-13/+31
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | fix scheduling policy service death detectionEric Laurent2013-07-022-13/+31
| | |/ / / / / / / / /
* | | | | | | | | | | Include what is neededGlenn Kasten2013-07-0214-29/+13
| |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge "Camera2Api: Creating a JPEG stream needs to use the right size"Eino-Ville Talvala2013-07-011-2/+17
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Camera2Api: Creating a JPEG stream needs to use the right sizeEino-Ville Talvala2013-07-011-2/+17
* | | | | | | | | | | am f64bd473: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release -...The Android Open Source Project2013-07-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | | | | | | | | | |
| | \ \ \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ \ \ Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-07-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | |
| | | * | | | | | | | | merge in jb-mr2-zeroday-release history after reset to jb-mr2-devThe Android Automerger2013-06-300-0/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | Update HTTP proxy configuration for all media playback inside stagefright.Andreas Huber2013-06-2816-2/+172