tree a1febe707526279b3ec1e40a7349608ad4a6f0c5
parent 2597496f2ddea6d6c6531b7257b2b9c13c74d05b
parent 0924dd88790ba9cda0d5a86df7d68b7446470fc7
author Jean-Baptiste Queru <jbq@google.com> 1346263101 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346263101 -0700

am 0924dd88: am 2aa37a7d: Merge "recordvideo: Add an option for choosing software encoders"

* commit '0924dd88790ba9cda0d5a86df7d68b7446470fc7':
  recordvideo: Add an option for choosing software encoders