tree e965c66766e6d362eca7e7b4474107740874dc7f
parent f296ee697409b4b55bef17d534edbc24a4619f0f
parent 6deb4b538ecf5cbd4418492bfb6b79df67eedfb7
author Jamie Gennis <jgennis@google.com> 1322616309 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1322616309 -0800

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