summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am ed7b688c: am aac43ea1: am b8b85ea2: Merge "Fix for bug 4126624. Change the...Gloria Wang2011-03-252-2/+1
|\
| * am b8b85ea2: Merge "Fix for bug 4126624. Change the mDrmManagerClientImpl to ...Gloria Wang2011-03-252-2/+1
| |\
| | * Fix for bug 4126624.Gloria Wang2011-03-242-2/+1
* | | am 3c1c3d89: (-s ours) am 480edfb9: am e2cd3353: Merge "Fix for bug 4165823. ...Gloria Wang2011-03-240-0/+0
|\ \ \ | |/ /
| * | am e2cd3353: Merge "Fix for bug 4165823. Add death listener to clean-up drmse...Gloria Wang2011-03-242-10/+34
| |\ \ | | |/
| | * Fix for bug 4165823.Gloria Wang2011-03-242-10/+34
* | | am 64233b86: am 503f4daf: am 0b1b2a32: Merge "Bug 4159373 Use HDCP debug sett...Glenn Kasten2011-03-231-0/+37
|\ \ \ | |/ /
| * | am 0b1b2a32: Merge "Bug 4159373 Use HDCP debug settings" into honeycomb-mr1Glenn Kasten2011-03-231-0/+37
| |\ \ | | |/
| | * Bug 4159373 Use HDCP debug settingsGlenn Kasten2011-03-231-0/+37
* | | Merge "Include strings.h for the strcasecmp prototype."Carl Shapiro2011-03-221-1/+1
|\ \ \
| * | | Include strings.h for the strcasecmp prototype.Carl Shapiro2011-03-221-1/+1
* | | | Merge "Delay signaling the end of audio playback until all frames have actual...Andreas Huber2011-03-224-8/+57
|\ \ \ \
| * | | | Delay signaling the end of audio playback until all frames have actually played.Andreas Huber2011-03-224-8/+57
* | | | | Merge "Fix AAC encoder test util and remove files that are not needed"James Dong2011-03-2210-589/+15
|\ \ \ \ \
| * | | | | Fix AAC encoder test util and remove files that are not neededJames Dong2011-03-2110-589/+15
* | | | | | Merge "Fix AMRWB test util and remove useless files"James Dong2011-03-228-281/+13
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix AMRWB test util and remove useless filesJames Dong2011-03-218-281/+13
| |/ / / /
* | | | | am fc4c13be: am 01240177: am 3cc797b9: Merge "Add one more field in DecryptHa...Gloria Wang2011-03-222-2/+23
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | am 3cc797b9: Merge "Add one more field in DecryptHandle to support bug 412662...Gloria Wang2011-03-222-2/+23
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge "Add one more field in DecryptHandle to support bug 4126624" into honey...Gloria Wang2011-03-222-2/+23
| | |\ \ \
| | | * | | Add one more field in DecryptHandle to support bug 4126624Gloria Wang2011-03-212-2/+23
* | | | | | am 71ba7d34: (-s ours) am 3da10728: am 453c0d5f: Merge "DO NOT MERGE: Enable ...Andreas Huber2011-03-220-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 453c0d5f: Merge "DO NOT MERGE: Enable http-live support for https:// urls,...Andreas Huber2011-03-222-3/+27
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsin...Andreas Huber2011-03-222-3/+27
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue.Andreas Huber2011-03-212-3/+27
* | | | | | am 97cd837e: (-s ours) am 4f87a46e: am 7abedd0c: Merge "do not merge: Cherry ...Gloria Wang2011-03-220-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 7abedd0c: Merge "do not merge: Cherry pick change I6529695c from master to...Gloria Wang2011-03-212-188/+104
| |\ \ \ \ \ | | |/ / / /
| | * | | | do not merge: Cherry pick change I6529695c from master to partially fix bug 4...Gloria Wang2011-03-212-188/+104
| | |/ / /
* | | | | am 6834f061: am 970d7dd9: am e2c32e9f: If nothing is to be copied, return rig...Andreas Huber2011-03-221-0/+4
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | am e2c32e9f: If nothing is to be copied, return right away.Andreas Huber2011-03-211-0/+4
| |\ \ \ | | |/ /
| | * | If nothing is to be copied, return right away.Andreas Huber2011-03-211-0/+4
* | | | Enable http-live support for https:// urls, fix a parsing issue.Andreas Huber2011-03-212-3/+27
| |_|/ |/| |
* | | Merge "Add read and write option in opening file for output in the writers"James Dong2011-03-212-2/+2
|\ \ \
| * | | Add read and write option in opening file for output in the writersJames Dong2011-03-212-2/+2
* | | | Merge "Fix for 4084554. DRM framework support for enabling/disabling copy con...Gloria Wang2011-03-212-188/+104
|\ \ \ \ | |/ / / |/| | |
| * | | Fix for 4084554.Gloria Wang2011-03-212-188/+104
* | | | Merge "Fix issue 3483718: audio streaming and A2DP."Eric Laurent2011-03-212-12/+33
|\ \ \ \ | |/ / / |/| | |
| * | | Fix issue 3483718: audio streaming and A2DP.Eric Laurent2011-03-212-12/+33
* | | | Merge "Support passing headers to MediaMetadataRetriever's setDataSource API"Andreas Huber2011-03-2111-18/+67
|\ \ \ \
| * | | | Support passing headers to MediaMetadataRetriever's setDataSource APIAndreas Huber2011-03-2111-18/+67
| |/ / /
* | | | Scale the thumbnail if display dimension is different from the actual buffer ...James Dong2011-03-201-1/+9
|/ / /
* | | Merge "Squashed commit of the following:"Andreas Huber2011-03-182-195/+145
|\ \ \
| * | | Squashed commit of the following:Andreas Huber2011-03-182-195/+145
* | | | am 2a102cce: (-s ours) am e68dc157: am a0dc8da2: Merge "DO NOT MERGE Send Web...Russell Brenner2011-03-180-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | am a0dc8da2: Merge "DO NOT MERGE Send WebView the current transform and wheth...Russell Brenner2011-03-181-0/+50
| |\ \ \ | | | |/ | | |/|
| | * | DO NOT MERGE Send WebView the current transform and whether we're drawing a l...Romain Guy2011-03-181-0/+50
* | | | Merge "Better organize media recorder error and information event and types"James Dong2011-03-184-38/+69
|\ \ \ \
| * | | | Better organize media recorder error and information event and typesJames Dong2011-03-184-38/+69
| | |_|/ | |/| |
* | | | Merge "Fix issue 4111672: AudioTrack control block flags"Eric Laurent2011-03-183-18/+40
|\ \ \ \
| * | | | Fix issue 4111672: AudioTrack control block flagsEric Laurent2011-03-183-18/+40