summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-160-0/+0
|\
| * SurfaceMediaSource: use the HW_TEXTURE usage bitJamie Gennis2011-12-151-1/+3
| * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-151-3/+1
| * SurfaceMediaSource: use the HW_TEXTURE usage bitJamie Gennis2011-12-151-1/+3
| * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-140-0/+0
| |\
* | \ am ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ic...Dave Burke2011-12-151-1/+3
|\ \ \
| * | | SurfaceMediaSource: use the HW_TEXTURE usage bitJamie Gennis2011-12-151-1/+3
| |/ /
* | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-140-0/+0
|\ \ \ | | |/ | |/|
| * | Revert the following patches because they may lead to power regression becaus...James Dong2011-12-147-84/+27
* | | am d70c64db: Revert the following patches because they may lead to power regr...James Dong2011-12-147-84/+27
|\ \ \ | | |/ | |/|
| * | Revert the following patches because they may lead to power regression becaus...James Dong2011-12-147-84/+27
* | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-130-0/+0
|\ \ \ | | |/ | |/|
| * | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-130-0/+0
| |\ \ | | |/ | |/|
* | | am 3ab63008: Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header...Andreas Huber2011-12-132-9/+31
|\ \ \ | |/ /
| * | DO NOT MERGE: Support for parsing of "folded" RTSP header valuesAndreas Huber2011-12-132-9/+31
* | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-130-0/+0
|\ \ \ | | |/ | |/|
| * | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-120-0/+0
| |\ \ | | |/ | |/|
* | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-120-0/+0
|\ \ \ | | |/ | |/|
| * | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-090-0/+0
| |\ \
* | \ \ Merge from ics-mr1The Android Open Source Project2011-12-121-2/+3
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix drm enumeration order, resolves failure to play forward lock ringtonesJeff Tinker2011-12-091-2/+3
| |/ /
* | | am ef664f62: Merge "Fix drm flag setting missed in false drm recognition fix....Jeff Tinker2011-12-091-0/+1
|\ \ \ | |/ /
| * | Fix drm flag setting missed in false drm recognition fix.Jeff Tinker2011-12-091-0/+1
* | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-090-0/+0
|\ \ \ | | |/ | |/|
| * | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-090-0/+0
| |\ \ | | |/ | |/|
| | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-080-0/+0
| | |\
* | | \ am aadbd80b: Fixed the false drm recognition.James Dong2011-12-092-10/+17
|\ \ \ \ | |/ / /
| * | | Fixed the false drm recognition.James Dong2011-12-082-10/+17
| |/ /
* | | am 68f592a8: Merge "Don\'t perform RTSP seeks right away but queue them for 2...Andreas Huber2011-12-082-4/+31
|\ \ \ | |/ /
| * | Merge "Don't perform RTSP seeks right away but queue them for 200ms" into ics...Andreas Huber2011-12-082-4/+31
| |\ \
| | * | Don't perform RTSP seeks right away but queue them for 200msAndreas Huber2011-12-082-4/+31
* | | | am 0ba9380a: Merge "Fix Bitreader "putBits" implementation, make sure we emul...Andreas Huber2011-12-084-13/+37
|\ \ \ \ | |/ / /
| * | | Fix Bitreader "putBits" implementation, make sure we emulate timestampsAndreas Huber2011-12-084-13/+37
| |/ /
* | | Reconcile with ics-mr0-release ics-mr1-releaseThe Android Open Source Project2011-12-080-0/+0
|\ \ \ | | |/ | |/|
| * | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-080-0/+0
| |\ \ | | |/ | |/|
| | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-060-0/+0
| | |\
| | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-050-0/+0
| | | |\
| | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-020-0/+0
| | | | |\
| | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-010-0/+0
| | | | | |\
| | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-300-0/+0
| | | | | | |\
| | | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-280-0/+0
| | | | | | | |\
| | | | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-220-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-170-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-160-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-150-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-130-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-090-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-090-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-080-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-060-0/+0
| | | | | | | | | | | | | | | | |\
generated by cgit v1.1 at 2024-06-30 01:58:14 +0000