summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | 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
| | | | |/ / / / / | | | |/| | | | |
* | | | | | | | | 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
| | * | | | | | 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-036-38/+280
| | * | | | | | DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding file...Mike Lockwood2011-05-034-121/+122
| | * | | | | | DO NOT MERGE Fix media scanner uri handling.Marco Nelissen2011-05-031-21/+13
| | * | | | | | DO NOT MERGE MTP and media provider support for multiple storage devices:Mike Lockwood2011-05-039-104/+288
* | | | | | | | am 0d560d45: am 9f7054fe: Merge "docs: add package description for mtp and a ...Scott Main2011-05-062-1/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 9f7054fe: Merge "docs: add package description for mtp and a little more i...Scott Main2011-05-062-1/+12
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | docs: add package description for mtp and a little more info to MtpDeviceScott Main2011-05-052-1/+12
| | |/ / / / /
* | | | | | | am 36132a48: DO NOT MERGE MediaScanner: Add special casing of WMP album art f...Mike Lockwood2011-05-041-29/+37
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoM...Mike Lockwood2011-05-041-29/+37
* | | | | | | am 8b1c74f9: DO NOT MERGE MediaScanner: Fix bug in "no media" handling logicMike Lockwood2011-05-041-3/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | DO NOT MERGE MediaScanner: Fix bug in "no media" handling logicMike Lockwood2011-05-041-3/+4
* | | | | | | am a792c804: DO NOT MERGE MTP: Implement GetThumb commandMike Lockwood2011-05-047-2/+100
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | DO NOT MERGE MTP: Implement GetThumb commandMike Lockwood2011-05-047-2/+100
* | | | | | | am af50821b: DO NOT MERGE MTP: Fix file descriptor leak in file editing exten...Mike Lockwood2011-05-042-24/+29
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | DO NOT MERGE MTP: Fix file descriptor leak in file editing extensionsMike Lockwood2011-05-042-24/+29
* | | | | | | am fdb50e6f: DO NOT MERGE MTP: Add extended operations to support in-place ed...Mike Lockwood2011-05-046-38/+280
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | DO NOT MERGE MTP: Add extended operations to support in-place editing of filesMike Lockwood2011-05-046-38/+280
* | | | | | | am fb623263: DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature fo...Mike Lockwood2011-05-044-121/+122
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding file...Mike Lockwood2011-05-044-121/+122
* | | | | | | am 7dd59229: DO NOT MERGE Fix media scanner uri handling.Marco Nelissen2011-05-041-21/+13
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | DO NOT MERGE Fix media scanner uri handling.Marco Nelissen2011-05-041-21/+13
* | | | | | | am d3e4290c: DO NOT MERGE MTP and media provider support for multiple storage...Mike Lockwood2011-05-049-104/+288
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | DO NOT MERGE MTP and media provider support for multiple storage devices:Mike Lockwood2011-05-049-104/+288
* | | | | | | am f181e416: am ec78f551: Add avg bandwidth estimate every 2 seconds - do not...James Dong2011-04-292-0/+12
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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 34cd123a: am b0d6f10e: Bug 4167061 remove debugging codeGlenn Kasten2011-04-131-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am b0d6f10e: Bug 4167061 remove debugging codeGlenn Kasten2011-04-131-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Bug 4167061 remove debugging codeGlenn Kasten2011-04-131-1/+1
* | | | | | | am 87ee132a: am c6c2285b: Enable HDCP debugging in Stagefright (1 of 2)Glenn Kasten2011-04-111-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 3a9f5143: am 66380f76: Stagefright: authenticate ANativeWindow.Jamie Gennis2011-04-081-0/+24
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 66380f76: Stagefright: authenticate ANativeWindow.Jamie Gennis2011-04-081-0/+24
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Stagefright: authenticate ANativeWindow.Jamie Gennis2011-04-081-0/+24