Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
* | Clean up references to AUDIO_FORMAT_PCM_8_24_BIT | Glenn Kasten | 2013-07-10 | 2 | -2/+2 | |
* | am 06a4604e: am 4a5c009b: Camera2/3: As a fallback, unilaterally free old rec... | Eino-Ville Talvala | 2013-07-08 | 2 | -14/+119 | |
|\ | ||||||
| * | am 4a5c009b: Camera2/3: As a fallback, unilaterally free old recording buffers | Eino-Ville Talvala | 2013-07-08 | 2 | -14/+119 | |
| |\ | ||||||
| | * | Camera2/3: As a fallback, unilaterally free old recording buffers | Eino-Ville Talvala | 2013-07-08 | 2 | -14/+119 | |
* | | | am 29196772: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge | The Android Open Source Project | 2013-07-08 | 0 | -0/+0 | |
|\ \ \ | |/ / | ||||||
| * | | Reconcile with jb-mr2-zeroday-release - do not merge | The Android Open Source Project | 2013-07-08 | 0 | -0/+0 | |
| |\ \ | ||||||
| | * \ | merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev | The Android Automerger | 2013-07-08 | 0 | -0/+0 | |
| | |\ \ | | | |/ | | |/| | ||||||
* | | | | am 1468dd9c: am c582fde9: resolved conflicts for merge of c158971f to stage-a... | Jean-Baptiste Queru | 2013-07-08 | 1 | -1/+12 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | am c582fde9: resolved conflicts for merge of c158971f to stage-aosp-master | Jean-Baptiste Queru | 2013-07-08 | 1 | -1/+12 | |
| |\ \ \ | ||||||
| | * \ \ | resolved conflicts for merge of c158971f to stage-aosp-master | Jean-Baptiste Queru | 2013-07-08 | 1 | -1/+12 | |
| | |\ \ \ | ||||||
| | | * \ \ | Merge "Store rtsp accessunit until PLAY response parsed" | Jean-Baptiste Queru | 2013-07-08 | 1 | -1/+12 | |
| | | |\ \ \ | ||||||
| | | | * | | | Store rtsp accessunit until PLAY response parsed | Yajun Zeng | 2013-05-13 | 1 | -1/+12 | |
* | | | | | | | am 8ebdfa8b: am 5de9ef20: am 365ed394: Merge "Typo in CameraParameters::set" | Jean-Baptiste Queru | 2013-07-08 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | am 5de9ef20: am 365ed394: Merge "Typo in CameraParameters::set" | Jean-Baptiste Queru | 2013-07-08 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | * | | | | | am 365ed394: Merge "Typo in CameraParameters::set" | Jean-Baptiste Queru | 2013-07-08 | 1 | -1/+1 | |
| | |\ \ \ \ \ | | | |/ / / / | ||||||
| | | * | | | | Merge "Typo in CameraParameters::set" | Jean-Baptiste Queru | 2013-07-08 | 1 | -1/+1 | |
| | | |\ \ \ \ | ||||||
| | | | * | | | | Typo in CameraParameters::set | You Kim | 2012-12-14 | 1 | -1/+1 | |
* | | | | | | | | am c26ab375: am 5d2ab2a6: am 8eef093c: Merge "libstagefright: Use LOG_BASIC w... | Jean-Baptiste Queru | 2013-07-08 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | am 5d2ab2a6: am 8eef093c: Merge "libstagefright: Use LOG_BASIC when use chrom... | Jean-Baptiste Queru | 2013-07-08 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | * | | | | | | am 8eef093c: Merge "libstagefright: Use LOG_BASIC when use chromium http stack" | Jean-Baptiste Queru | 2013-07-08 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ | | | |/ / / / / | ||||||
| | | * | | | | | Merge "libstagefright: Use LOG_BASIC when use chromium http stack" | Jean-Baptiste Queru | 2013-07-08 | 1 | -1/+1 | |
| | | |\ \ \ \ \ | ||||||
| | | | * | | | | | libstagefright: Use LOG_BASIC when use chromium http stack | Xuefeng Deng | 2012-08-17 | 1 | -1/+1 | |
* | | | | | | | | | am 046d9c8d: am 06197925: am 267363ee: Merge "Prevent Media Server crash whil... | Jean-Baptiste Queru | 2013-07-08 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | am 06197925: am 267363ee: Merge "Prevent Media Server crash while the Awesome... | Jean-Baptiste Queru | 2013-07-08 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | ||||||
| | * | | | | | | | am 267363ee: Merge "Prevent Media Server crash while the AwesomePlayer getBit... | Jean-Baptiste Queru | 2013-07-08 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | ||||||
| | | * | | | | | | Merge "Prevent Media Server crash while the AwesomePlayer getBitrate return t... | Jean-Baptiste Queru | 2013-07-08 | 1 | -1/+1 | |
| | | |\ \ \ \ \ \ | ||||||
| | | | * | | | | | | Prevent Media Server crash while the AwesomePlayer getBitrate return true wit... | hovanchen | 2013-07-03 | 1 | -1/+1 | |
* | | | | | | | | | | am 9f0e0597: am 7266bc80: am ca7f1609: Merge "Prevent double disconnects in R... | Jean-Baptiste Queru | 2013-07-08 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | ||||||
| * | | | | | | | | | am 7266bc80: am ca7f1609: Merge "Prevent double disconnects in RTSPSource" | Jean-Baptiste Queru | 2013-07-08 | 1 | -0/+4 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | ||||||
| | * | | | | | | | | am ca7f1609: Merge "Prevent double disconnects in RTSPSource" | Jean-Baptiste Queru | 2013-07-08 | 1 | -0/+4 | |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | ||||||
| | | * | | | | | | | Merge "Prevent double disconnects in RTSPSource" | Jean-Baptiste Queru | 2013-07-08 | 1 | -0/+4 | |
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | ||||||
| | | | * | | | | | | Prevent double disconnects in RTSPSource | Fredrik Rosin | 2013-07-01 | 1 | -0/+4 | |
| | | |/ / / / / / | ||||||
* | | | | | | | | | Merge "Explicitly compare raw pointers to NULL" | Glenn Kasten | 2013-07-08 | 1 | -18/+20 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Explicitly compare raw pointers to NULL | Glenn Kasten | 2013-07-02 | 1 | -18/+20 | |
* | | | | | | | | | | Merge "mv libcpustats from frameworks/native to frameworks/av" | Glenn Kasten | 2013-07-08 | 6 | -0/+568 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | mv libcpustats from frameworks/native to frameworks/av | Glenn Kasten | 2013-06-18 | 6 | -0/+568 | |
* | | | | | | | | | | | am 9a25c012: am eced745a: Merge "Part of fix for TEE resource leaks when app ... | Jeff Tinker | 2013-07-07 | 2 | -1/+19 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | am eced745a: Merge "Part of fix for TEE resource leaks when app crashes" into... | Jeff Tinker | 2013-07-07 | 2 | -1/+19 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | ||||||
| | * | | | | | | | | | Merge "Part of fix for TEE resource leaks when app crashes" into jb-mr2-dev | Jeff Tinker | 2013-07-07 | 2 | -1/+19 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | Part of fix for TEE resource leaks when app crashes | Jeff Tinker | 2013-07-03 | 2 | -1/+19 | |
* | | | | | | | | | | | | am ace2378c: am f59a4b39: fix scheduling policy service death detection | Eric Laurent | 2013-07-03 | 2 | -13/+31 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | am f59a4b39: fix scheduling policy service death detection | Eric Laurent | 2013-07-03 | 2 | -13/+31 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | fix scheduling policy service death detection | Eric Laurent | 2013-07-02 | 2 | -13/+31 | |
| | |/ / / / / / / / / | ||||||
* | | | | | | | | | | | Include what is needed | Glenn Kasten | 2013-07-02 | 14 | -29/+13 | |
| |_|_|/ / / / / / / |/| | | | | | | | | | ||||||
* | | | | | | | | | | Merge "Camera2Api: Creating a JPEG stream needs to use the right size" | Eino-Ville Talvala | 2013-07-01 | 1 | -2/+17 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Camera2Api: Creating a JPEG stream needs to use the right size | Eino-Ville Talvala | 2013-07-01 | 1 | -2/+17 | |
* | | | | | | | | | | | am f64bd473: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release -... | The Android Open Source Project | 2013-07-01 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | ||||||
| | | | | | | | | | | | ||||||
| | \ \ \ \ \ \ \ \ \ | ||||||
| *-. \ \ \ \ \ \ \ \ \ | Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge | The Android Open Source Project | 2013-07-01 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | ||||||
| | | * | | | | | | | | | merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev | The Android Automerger | 2013-06-30 | 0 | -0/+0 | |
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | | | ||||||
| | * | | | | | | | | | | Update HTTP proxy configuration for all media playback inside stagefright. | Andreas Huber | 2013-06-28 | 16 | -2/+172 |