summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* rename /system/lib/drm/plugins/native/ to /system/lib/drm-plugin/Gloria Wang2011-01-181-1/+1
* am bf6ccb04: am 307003a8: Merge "integrate videoeditor preview player." into ...Dharmaray Kundargi2011-01-172-0/+2
|\
| * am 307003a8: Merge "integrate videoeditor preview player." into honeycombDharmaray Kundargi2011-01-172-0/+2
| |\
| | * integrate videoeditor preview player.Dharmaray Kundargi2011-01-162-0/+2
* | | am 89a11e5d: (-s ours) am 9286cfe5: (-s ours) merge 83fdc69e from gingerbread...Jean-Baptiste Queru2011-01-160-0/+0
|\ \ \ | |/ /
| * | am 9286cfe5: (-s ours) merge 83fdc69e from gingerbread - do not mergeJean-Baptiste Queru2011-01-140-0/+0
| |\ \
| | * \ merge 83fdc69e from gingerbread - do not mergeJean-Baptiste Queru2011-01-1411-212/+63
| | |\ \
| | | * | Squash commits of the following patches, cherry-picked from other branch - do...James Dong2011-01-1211-212/+63
* | | | | am b3f44773: am e7df0dde: Merge "Fixed thrashing in the cached buffer during ...James Dong2011-01-161-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | am e7df0dde: Merge "Fixed thrashing in the cached buffer during 720p YT video...James Dong2011-01-141-2/+2
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Fixed thrashing in the cached buffer during 720p YT video streamingJames Dong2011-01-141-2/+2
* | | | | am c35b3268: am 1dac4cdd: am a220a297: Merge "Initial OMA DRM forward lock co...Gloria Wang2011-01-1327-0/+5370
|\ \ \ \ \ | |/ / / /
| * | | | am 1dac4cdd: am a220a297: Merge "Initial OMA DRM forward lock contribution"Gloria Wang2011-01-1327-0/+5370
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | am a220a297: Merge "Initial OMA DRM forward lock contribution"Gloria Wang2011-01-1327-0/+5370
| | |\ \ \
| | | * \ \ Merge "Initial OMA DRM forward lock contribution"Gloria Wang2011-01-1327-0/+5370
| | | |\ \ \
| | | | * | | Initial OMA DRM forward lock contributionPravat Dalbehera2011-01-0527-0/+5370
* | | | | | | am 089971ea: am c14b10c3: Merge "Add audio encoding parameters check" into ho...James Dong2011-01-132-18/+89
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am c14b10c3: Merge "Add audio encoding parameters check" into honeycombJames Dong2011-01-132-18/+89
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Add audio encoding parameters checkJames Dong2011-01-122-18/+89
* | | | | | | am f97e58ef: am c88b2c44: am 7c615360: Fail to parse duration instead of asse...Andreas Huber2011-01-120-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am c88b2c44: am 7c615360: Fail to parse duration instead of asserting, if the...Andreas Huber2011-01-120-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | am 7c615360: Fail to parse duration instead of asserting, if the server respo...Andreas Huber2011-01-121-5/+7
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Fail to parse duration instead of asserting, if the server response cannot be...Andreas Huber2011-01-121-5/+7
* | | | | | | am 126410ed: (-s ours) am 0ef0d76a: (-s ours) am 7e2f9cc8: DO NOT MERGE: Fix ...Andreas Huber2011-01-120-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 0ef0d76a: (-s ours) am 7e2f9cc8: DO NOT MERGE: Fix Matroska issuesAndreas Huber2011-01-120-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 7e2f9cc8: DO NOT MERGE: Fix Matroska issuesAndreas Huber2011-01-113-75/+317
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | DO NOT MERGE: Fix Matroska issuesAndreas Huber2011-01-113-75/+317
* | | | | | | am b2d782d0: (-s ours) am d439ac39: resolved conflicts for merge of e7fbfb6b ...repo sync2011-01-120-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am d439ac39: resolved conflicts for merge of e7fbfb6b to gingerbread-plus-aosprepo sync2011-01-120-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | resolved conflicts for merge of e7fbfb6b to gingerbread-plus-aosprepo sync2011-01-118-38/+689
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | DO NOT MERGE: Fix parsing of ntp= PLAY response.Andreas Huber2011-01-118-39/+690
* | | | | | | am 4fbf60e7: (-s ours) am 0569e589: (-s ours) am 13d1cb56: Merge "Avoid deadl...James Dong2011-01-120-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 0569e589: (-s ours) am 13d1cb56: Merge "Avoid deadlock in OMX::freeNode by...James Dong2011-01-120-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 13d1cb56: Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecOb...James Dong2011-01-103-7/+18
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold...James Dong2011-01-103-7/+18
* | | | | | | am 156a3c9b: am 7928ca6f: Merge "Fail to parse duration instead of asserting,...Andreas Huber2011-01-121-5/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 7928ca6f: Merge "Fail to parse duration instead of asserting, if the serve...Andreas Huber2011-01-121-5/+7
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge "Fail to parse duration instead of asserting, if the server response ca...Andreas Huber2011-01-121-5/+7
| | |\ \ \ \ \
| | | * | | | | Fail to parse duration instead of asserting, if the server response cannot be...Andreas Huber2011-01-121-5/+7
* | | | | | | | am 999fb5a5: am 068b41d5: Merge "Publish MediaMetadataRetriever.java as publi...James Dong2011-01-1210-135/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 068b41d5: Merge "Publish MediaMetadataRetriever.java as public API" into h...James Dong2011-01-1210-135/+11
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Publish MediaMetadataRetriever.java as public APIJames Dong2011-01-1210-135/+11
* | | | | | | | am 5df82ef9: am cb0f6d0b: Merge "Speed up MP3Extractor using cached reads" in...James Dong2011-01-121-4/+33
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am cb0f6d0b: Merge "Speed up MP3Extractor using cached reads" into honeycombJames Dong2011-01-121-4/+33
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Speed up MP3Extractor using cached reads" into honeycombJames Dong2011-01-121-4/+33
| | |\ \ \ \ \ \
| | | * | | | | | Speed up MP3Extractor using cached readsJames Dong2011-01-121-4/+33
| | | |/ / / / /
* | | | | | | | am 5ac80dde: am e5cf7f2b: Merge "Fix race in buffer ref counting." into honey...Glenn Kasten2011-01-121-10/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am e5cf7f2b: Merge "Fix race in buffer ref counting." into honeycombGlenn Kasten2011-01-121-10/+3
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Fix race in buffer ref counting.Glenn Kasten2011-01-121-10/+3
| | |/ / / / /
* | | | | | | Merge "Bug 3229711"Glenn Kasten2011-01-121-1/+1
|\ \ \ \ \ \ \