summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 4d8ceada: am dbfd055d: am a6f1104b: Use pread() to get the decrypted data ...Gloria Wang2011-05-201-0/+7
|\
| * am dbfd055d: am a6f1104b: Use pread() to get the decrypted data for container...Gloria Wang2011-05-201-0/+7
| |\
| | * am a6f1104b: Use pread() to get the decrypted data for container based DRM fi...Gloria Wang2011-05-201-0/+7
| | |\
| | | * Use pread() to get the decrypted data for container based DRM file.Gloria Wang2011-05-201-0/+7
* | | | Merge "Merge Chromium at 10.0.621.0: Fixes for libstagefreight"Kristian Monsen2011-05-202-21/+23
|\ \ \ \
| * | | | Merge Chromium at 10.0.621.0: Fixes for libstagefreightKristian Monsen2011-05-132-21/+23
* | | | | Merge "Publish setLocation() method as a public Java API"James Dong2011-05-191-5/+4
|\ \ \ \ \
| * | | | | Publish setLocation() method as a public Java APIJames Dong2011-05-181-5/+4
* | | | | | Merge "Add one more MIME type (audio/aac-adts) for aac file. Fix for bug 4463...Gloria Wang2011-05-191-0/+1
|\ \ \ \ \ \
| * | | | | | Add one more MIME type (audio/aac-adts) for aac file.Gloria Wang2011-05-191-0/+1
* | | | | | | resolved conflicts for merge of a8939e0d to masterJames Dong2011-05-194-30/+162
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | am 380244e9: am d148a499: Merge "Using widevine:// to stream adaptive bitrate...James Dong2011-05-184-29/+155
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | am d148a499: Merge "Using widevine:// to stream adaptive bitrate wvm content ...James Dong2011-05-184-29/+155
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" in...James Dong2011-05-184-29/+155
| | | |\ \ \ \
| | | | * | | | Using widevine:// to stream adaptive bitrate wvm content no longerAndreas Huber2011-05-104-29/+155
| * | | | | | | am 5a6c3d49: am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit...Gloria Wang2011-05-182-8/+4
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit of the follo...Gloria Wang2011-05-182-8/+4
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into h...Gloria Wang2011-05-182-8/+4
| | | |\ \ \ \ \
| | | | * | | | | DO NOT MERGEGloria Wang2011-05-132-8/+4
| | | | |/ / / /
* | | | | | | | Merge "Properly forward rotation information from input format to output form...Andreas Huber2011-05-181-2/+10
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Properly forward rotation information from input format to output format.Andreas Huber2011-05-181-2/+10
* | | | | | | | am 53b988ba: am 5a79cfd7: am 27ac64ec: Merge "StorageVolume: Add getStorageId...Mike Lockwood2011-05-181-7/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * | | | | | am 5a79cfd7: am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" ...Mike Lockwood2011-05-171-7/+8
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycom...Mike Lockwood2011-05-171-7/+8
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | StorageVolume: Add getStorageId() accessorMike Lockwood2011-05-171-7/+8
| * | | | | | am bf81d4be: am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS me...Andreas Huber2011-05-171-1/+7
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even i...Andreas Huber2011-05-171-1/+7
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(code...Andreas Huber2011-05-171-1/+7
| | | |\ \ \ \
| | | | * | | | DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-speci...Andreas Huber2011-05-041-1/+7
| * | | | | | | am d90a2c4d: am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework...Dianne Hackborn2011-05-161-2/+2
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size...Dianne Hackborn2011-05-161-2/+2
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge "DO NOT MERGE. Integrate from master: Rework display size access." int...Dianne Hackborn2011-05-161-2/+2
| | | |\ \ \ \ \
| | | | * | | | | DO NOT MERGE. Integrate from master: Rework display size access.Dianne Hackborn2011-05-161-2/+2
| | | | | |/ / / | | | | |/| | |
* | | | | | | | Revert "Add const to the finders method in MetaData.cpp"James Dong2011-05-172-7/+7
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Make track informational event optional, depending on system propertyJames Dong2011-05-172-0/+35
* | | | | | | Claim support for .3gpp2 A/B files.Andreas Huber2011-05-171-0/+3
* | | | | | | Disable yuv->yuv mode and external display support until various driver fixes...Andreas Huber2011-05-162-1/+11
* | | | | | | Merge "Instead of using an RGB surface and conversion yuv420->rgb565"Andreas Huber2011-05-161-7/+58
|\ \ \ \ \ \ \
| * | | | | | | Instead of using an RGB surface and conversion yuv420->rgb565Andreas Huber2011-05-051-7/+58
* | | | | | | | resolved conflicts for merge of b107f4de to masterMike Lockwood2011-05-164-7/+29
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am e23639e0: am 15afd076: Merge "MTP: Have GetStorageInfo command return corr...Mike Lockwood2011-05-164-7/+30
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | am 15afd076: Merge "MTP: Have GetStorageInfo command return correct storage t...Mike Lockwood2011-05-164-7/+30
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | MTP: Have GetStorageInfo command return correct storage type for removable st...Mike Lockwood2011-05-164-7/+30
| * | | | | | | am b822d246: am 0a93d875: Merge "StorageManager: Clean up and generalize sto...Mike Lockwood2011-05-161-2/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 0a93d875: Merge "StorageManager: Clean up and generalize storage configur...Mike Lockwood2011-05-161-2/+1
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | StorageManager: Clean up and generalize storage configuration resourcesMike Lockwood2011-05-161-2/+1
| | | | |/ / / | | | |/| | |
| | | * | | | Merge remote branch 'goog/honeycomb-mr1' into honeycomb-mr2The Android Automerger2011-05-082-1/+12
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoM...Mike Lockwood2011-05-031-29/+37
| | | * | | | DO NOT MERGE MediaScanner: Fix bug in "no media" handling logicMike Lockwood2011-05-031-3/+4
| | | * | | | DO NOT MERGE MTP: Implement GetThumb commandMike Lockwood2011-05-037-2/+100