summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit of the follo...Gloria Wang2011-05-184-17/+28
|\ \ \ | |/ /
| * | Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into h...Gloria Wang2011-05-184-17/+28
| |\ \
| | * | DO NOT MERGEGloria Wang2011-05-134-17/+28
| | |/
* | | 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 15afd076: Merge "MTP: Have GetStorageInfo command return correct storage t...Mike Lockwood2011-05-162-4/+8
|\ \ \ | |/ /
| * | MTP: Have GetStorageInfo command return correct storage type for removable st...Mike Lockwood2011-05-162-4/+8
| |/
* | Merge remote branch 'goog/honeycomb-mr2' into honeycomb-LTEThe Android Automerger2011-05-080-0/+0
|\ \ | |/
| * 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-035-1/+34
| * DO NOT MERGE MTP: Fix file descriptor leak in file editing extensionsMike Lockwood2011-05-032-24/+29
| * DO NOT MERGE MTP: Add extended operations to support in-place editing of filesMike Lockwood2011-05-035-8/+268
| * DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding file...Mike Lockwood2011-05-032-16/+13
| * DO NOT MERGE MTP and media provider support for multiple storage devices:Mike Lockwood2011-05-034-8/+9
* | DO NOT MERGE MediaScanner: Fix bug in "no media" handling logicMike Lockwood2011-05-041-3/+4
* | DO NOT MERGE MTP: Implement GetThumb commandMike Lockwood2011-05-045-1/+34
* | DO NOT MERGE MTP: Fix file descriptor leak in file editing extensionsMike Lockwood2011-05-042-24/+29
* | DO NOT MERGE MTP: Add extended operations to support in-place editing of filesMike Lockwood2011-05-045-8/+268
* | DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding file...Mike Lockwood2011-05-042-16/+13
* | DO NOT MERGE MTP and media provider support for multiple storage devices:Mike Lockwood2011-05-044-8/+9
* | am ec78f551: Add avg bandwidth estimate every 2 seconds - do not merge.James Dong2011-04-292-0/+12
|\ \ | |/
| * Add avg bandwidth estimate every 2 seconds - do not merge.James Dong2011-04-282-0/+12
* | am 83ddcdf7: Add heartbeat error codes into MediaErrors.hGloria Wang2011-04-271-0/+11
|\ \ | |/
| * Add heartbeat error codes into MediaErrors.hGloria Wang2011-04-261-0/+11
* | am 223995dc: Fix issue 4335692: HDMI media volumeEric Laurent2011-04-261-0/+7
|\ \ | |/
| * Fix issue 4335692: HDMI media volumeEric Laurent2011-04-251-0/+7
* | am b0d6f10e: Bug 4167061 remove debugging codeGlenn Kasten2011-04-131-1/+1
|\ \ | |/
| * Bug 4167061 remove debugging codeGlenn Kasten2011-04-131-1/+1
* | am c6c2285b: Enable HDCP debugging in Stagefright (1 of 2)Glenn Kasten2011-04-111-1/+1
|\ \ | |/
| * Enable HDCP debugging in Stagefright (1 of 2)Glenn Kasten2011-04-111-1/+1
* | am 66380f76: Stagefright: authenticate ANativeWindow.Jamie Gennis2011-04-081-0/+24
|\ \ | |/
| * Stagefright: authenticate ANativeWindow.Jamie Gennis2011-04-081-0/+24
* | am ffa670b5: Bug 4167061Glenn Kasten2011-03-311-1/+1
|\ \ | |/
| * Bug 4167061Glenn Kasten2011-03-301-1/+1
* | am b676b73e: Merge "When http streaming and Content-Length is unknown, make s...Andreas Huber2011-03-301-1/+8
|\ \ | |/
| * Merge "When http streaming and Content-Length is unknown, make sure to return...Andreas Huber2011-03-301-1/+8
| |\
| | * When http streaming and Content-Length is unknown, make sure to return allAndreas Huber2011-03-301-1/+8
* | | am ebf6a72b: Merge "Surfaceflinger expects rectangles to be specified right/b...Andreas Huber2011-03-302-4/+4
|\ \ \ | |/ /
| * | Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.Andreas Huber2011-03-292-4/+4
| |/
* | am 2edbdcc6: Merge "After a seek there\'s a brief period where audio time isn...Andreas Huber2011-03-281-0/+5
|\ \ | |/
| * Merge "After a seek there's a brief period where audio time isn't reestablish...Andreas Huber2011-03-281-0/+5
| |\
| | * After a seek there's a brief period where audio time isn't reestablished.Andreas Huber2011-03-251-0/+5
* | | am 1457ef74: Merge "Make sure we post a video event when seeking after seeing...Andreas Huber2011-03-251-2/+17
|\ \ \ | |/ /
| * | Make sure we post a video event when seeking after seeing video EOS before.Andreas Huber2011-03-251-2/+17
| |/
* | am 837430dd: Merge "Switch to use SF cached source" into honeycomb-mr1James Dong2011-03-251-6/+1
|\ \ | |/
| * Merge "Switch to use SF cached source" into honeycomb-mr1James Dong2011-03-251-6/+1
| |\