From: Jamie Gennis <jgennis@google.com>
Date: Wed, 30 Nov 2011 18:50:49 +0000 (-0800)
Subject: am c040e1e7: am 6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bit" into... 
X-Git-Tag: android-x86-4.4-r1~1579^2~401
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cd9e929c8490d1410e6d99c9b54585cb2fea569c;p=android-x86%2Fframeworks-av.git

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

* commit 'c040e1e77923d81050f2d3dbdac5d07e01be72f6':
  SurfaceMediaSource: use the vid enc usage bit
---

cd9e929c8490d1410e6d99c9b54585cb2fea569c