summaryrefslogtreecommitdiffstats
path: root/media/mtp
diff options
context:
space:
mode:
authorJamie Gennis <jgennis@google.com>2011-11-29 17:26:32 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-29 17:26:32 -0800
commit15031854d15ffcc5c955290f61aa59aa09e1fde9 (patch)
treed0cf40e356b3fdd74a907275b45f41680287eb3f /media/mtp
parent8a1fac32b307cfa096b343f219d471365b657ad8 (diff)
parent21befea3720fb847aef5440d507902d8705a671a (diff)
downloadframeworks_av-15031854d15ffcc5c955290f61aa59aa09e1fde9.zip
frameworks_av-15031854d15ffcc5c955290f61aa59aa09e1fde9.tar.gz
frameworks_av-15031854d15ffcc5c955290f61aa59aa09e1fde9.tar.bz2
am 6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1
* commit '6f1dd757cb158d17c76baeb170f7db2271802ef8': SurfaceMediaSource: use the vid enc usage bit
Diffstat (limited to 'media/mtp')
0 files changed, 0 insertions, 0 deletions