tree d0cf40e356b3fdd74a907275b45f41680287eb3f
parent 8a1fac32b307cfa096b343f219d471365b657ad8
parent 21befea3720fb847aef5440d507902d8705a671a
author Jamie Gennis <jgennis@google.com> 1322616392 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322616392 -0800

am 6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1

* commit '6f1dd757cb158d17c76baeb170f7db2271802ef8':
  SurfaceMediaSource: use the vid enc usage bit