index
:
frameworks_base.git
replicant-2.2
replicant-2.3
replicant-4.0
replicant-4.2
replicant-6.0
frameworks/base
git repository hosting
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
media
Commit message (
Expand
)
Author
Age
Files
Lines
*
am 4d8ceada: am dbfd055d: am a6f1104b: Use pread() to get the decrypted data ...
Gloria Wang
2011-05-20
1
-0
/
+7
|
\
|
*
am dbfd055d: am a6f1104b: Use pread() to get the decrypted data for container...
Gloria Wang
2011-05-20
1
-0
/
+7
|
|
\
|
|
*
am a6f1104b: Use pread() to get the decrypted data for container based DRM fi...
Gloria Wang
2011-05-20
1
-0
/
+7
|
|
|
\
|
|
|
*
Use pread() to get the decrypted data for container based DRM file.
Gloria Wang
2011-05-20
1
-0
/
+7
*
|
|
|
Merge "Merge Chromium at 10.0.621.0: Fixes for libstagefreight"
Kristian Monsen
2011-05-20
2
-21
/
+23
|
\
\
\
\
|
*
|
|
|
Merge Chromium at 10.0.621.0: Fixes for libstagefreight
Kristian Monsen
2011-05-13
2
-21
/
+23
*
|
|
|
|
Merge "Publish setLocation() method as a public Java API"
James Dong
2011-05-19
1
-5
/
+4
|
\
\
\
\
\
|
*
|
|
|
|
Publish setLocation() method as a public Java API
James Dong
2011-05-18
1
-5
/
+4
*
|
|
|
|
|
Merge "Add one more MIME type (audio/aac-adts) for aac file. Fix for bug 4463...
Gloria Wang
2011-05-19
1
-0
/
+1
|
\
\
\
\
\
\
|
*
|
|
|
|
|
Add one more MIME type (audio/aac-adts) for aac file.
Gloria Wang
2011-05-19
1
-0
/
+1
*
|
|
|
|
|
|
resolved conflicts for merge of a8939e0d to master
James Dong
2011-05-19
4
-30
/
+162
|
\
\
\
\
\
\
\
|
|
|
_
|
_
|
/
/
/
|
|
/
|
|
|
|
|
|
*
|
|
|
|
|
am 380244e9: am d148a499: Merge "Using widevine:// to stream adaptive bitrate...
James Dong
2011-05-18
4
-29
/
+155
|
|
\
\
\
\
\
\
|
|
|
|
_
|
_
|
/
/
|
|
|
/
|
|
|
|
|
|
*
|
|
|
|
am d148a499: Merge "Using widevine:// to stream adaptive bitrate wvm content ...
James Dong
2011-05-18
4
-29
/
+155
|
|
|
\
\
\
\
\
|
|
|
|
|
_
|
_
|
/
|
|
|
|
/
|
|
|
|
|
|
*
|
|
|
Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" in...
James Dong
2011-05-18
4
-29
/
+155
|
|
|
|
\
\
\
\
|
|
|
|
*
|
|
|
Using widevine:// to stream adaptive bitrate wvm content no longer
Andreas Huber
2011-05-10
4
-29
/
+155
|
*
|
|
|
|
|
|
am 5a6c3d49: am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit...
Gloria Wang
2011-05-18
2
-8
/
+4
|
|
\
\
\
\
\
\
\
|
|
|
/
/
/
/
/
/
|
|
*
|
|
|
|
|
am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit of the follo...
Gloria Wang
2011-05-18
2
-8
/
+4
|
|
|
\
\
\
\
\
\
|
|
|
|
/
/
/
/
/
|
|
|
*
|
|
|
|
Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into h...
Gloria Wang
2011-05-18
2
-8
/
+4
|
|
|
|
\
\
\
\
\
|
|
|
|
*
|
|
|
|
DO NOT MERGE
Gloria Wang
2011-05-13
2
-8
/
+4
|
|
|
|
|
/
/
/
/
*
|
|
|
|
|
|
|
Merge "Properly forward rotation information from input format to output form...
Andreas Huber
2011-05-18
1
-2
/
+10
|
\
\
\
\
\
\
\
\
|
|
_
|
_
|
_
|
_
|
_
|
/
/
|
/
|
|
|
|
|
|
|
|
*
|
|
|
|
|
|
Properly forward rotation information from input format to output format.
Andreas Huber
2011-05-18
1
-2
/
+10
*
|
|
|
|
|
|
|
am 53b988ba: am 5a79cfd7: am 27ac64ec: Merge "StorageVolume: Add getStorageId...
Mike Lockwood
2011-05-18
1
-7
/
+8
|
\
\
\
\
\
\
\
\
|
|
/
/
/
/
/
/
/
|
/
|
/
/
/
/
/
/
|
|
/
/
/
/
/
/
|
*
|
|
|
|
|
am 5a79cfd7: am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" ...
Mike Lockwood
2011-05-17
1
-7
/
+8
|
|
\
\
\
\
\
\
|
|
|
/
/
/
/
/
|
|
*
|
|
|
|
am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycom...
Mike Lockwood
2011-05-17
1
-7
/
+8
|
|
|
\
\
\
\
\
|
|
|
|
/
/
/
/
|
|
|
*
|
|
|
StorageVolume: Add getStorageId() accessor
Mike Lockwood
2011-05-17
1
-7
/
+8
|
*
|
|
|
|
|
am bf81d4be: am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS me...
Andreas Huber
2011-05-17
1
-1
/
+7
|
|
\
\
\
\
\
\
|
|
|
/
/
/
/
/
|
|
*
|
|
|
|
am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even i...
Andreas Huber
2011-05-17
1
-1
/
+7
|
|
|
\
\
\
\
\
|
|
|
|
/
/
/
/
|
|
|
*
|
|
|
Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(code...
Andreas Huber
2011-05-17
1
-1
/
+7
|
|
|
|
\
\
\
\
|
|
|
|
*
|
|
|
DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-speci...
Andreas Huber
2011-05-04
1
-1
/
+7
|
*
|
|
|
|
|
|
am d90a2c4d: am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework...
Dianne Hackborn
2011-05-16
1
-2
/
+2
|
|
\
\
\
\
\
\
\
|
|
|
/
/
/
/
/
/
|
|
*
|
|
|
|
|
am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size...
Dianne Hackborn
2011-05-16
1
-2
/
+2
|
|
|
\
\
\
\
\
\
|
|
|
|
/
/
/
/
/
|
|
|
*
|
|
|
|
Merge "DO NOT MERGE. Integrate from master: Rework display size access." int...
Dianne Hackborn
2011-05-16
1
-2
/
+2
|
|
|
|
\
\
\
\
\
|
|
|
|
*
|
|
|
|
DO NOT MERGE. Integrate from master: Rework display size access.
Dianne Hackborn
2011-05-16
1
-2
/
+2
|
|
|
|
|
|
/
/
/
|
|
|
|
|
/
|
|
|
*
|
|
|
|
|
|
|
Revert "Add const to the finders method in MetaData.cpp"
James Dong
2011-05-17
2
-7
/
+7
|
|
_
|
_
|
_
|
_
|
/
/
|
/
|
|
|
|
|
|
*
|
|
|
|
|
|
Make track informational event optional, depending on system property
James Dong
2011-05-17
2
-0
/
+35
*
|
|
|
|
|
|
Claim support for .3gpp2 A/B files.
Andreas Huber
2011-05-17
1
-0
/
+3
*
|
|
|
|
|
|
Disable yuv->yuv mode and external display support until various driver fixes...
Andreas Huber
2011-05-16
2
-1
/
+11
*
|
|
|
|
|
|
Merge "Instead of using an RGB surface and conversion yuv420->rgb565"
Andreas Huber
2011-05-16
1
-7
/
+58
|
\
\
\
\
\
\
\
|
*
|
|
|
|
|
|
Instead of using an RGB surface and conversion yuv420->rgb565
Andreas Huber
2011-05-05
1
-7
/
+58
*
|
|
|
|
|
|
|
resolved conflicts for merge of b107f4de to master
Mike Lockwood
2011-05-16
4
-7
/
+29
|
\
\
\
\
\
\
\
\
|
|
|
/
/
/
/
/
/
|
|
/
|
|
|
|
|
|
|
*
|
|
|
|
|
|
am e23639e0: am 15afd076: Merge "MTP: Have GetStorageInfo command return corr...
Mike Lockwood
2011-05-16
4
-7
/
+30
|
|
\
\
\
\
\
\
\
|
|
|
|
/
/
/
/
/
|
|
|
/
|
|
|
|
|
|
|
*
|
|
|
|
|
am 15afd076: Merge "MTP: Have GetStorageInfo command return correct storage t...
Mike Lockwood
2011-05-16
4
-7
/
+30
|
|
|
\
\
\
\
\
\
|
|
|
|
|
/
/
/
/
|
|
|
|
/
|
|
|
|
|
|
|
*
|
|
|
|
MTP: Have GetStorageInfo command return correct storage type for removable st...
Mike Lockwood
2011-05-16
4
-7
/
+30
|
*
|
|
|
|
|
|
am b822d246: am 0a93d875: Merge "StorageManager: Clean up and generalize sto...
Mike Lockwood
2011-05-16
1
-2
/
+1
|
|
\
\
\
\
\
\
\
|
|
|
/
/
/
/
/
/
|
|
*
|
|
|
|
|
am 0a93d875: Merge "StorageManager: Clean up and generalize storage configur...
Mike Lockwood
2011-05-16
1
-2
/
+1
|
|
|
\
\
\
\
\
\
|
|
|
|
/
/
/
/
/
|
|
|
*
|
|
|
|
StorageManager: Clean up and generalize storage configuration resources
Mike Lockwood
2011-05-16
1
-2
/
+1
|
|
|
|
|
/
/
/
|
|
|
|
/
|
|
|
|
|
|
*
|
|
|
Merge remote branch 'goog/honeycomb-mr1' into honeycomb-mr2
The Android Automerger
2011-05-08
2
-1
/
+12
|
|
|
|
\
\
\
\
|
|
|
|
|
_
|
/
/
|
|
|
|
/
|
|
|
|
|
|
*
|
|
|
DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoM...
Mike Lockwood
2011-05-03
1
-29
/
+37
|
|
|
*
|
|
|
DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic
Mike Lockwood
2011-05-03
1
-3
/
+4
|
|
|
*
|
|
|
DO NOT MERGE MTP: Implement GetThumb command
Mike Lockwood
2011-05-03
7
-2
/
+100
[next]