tree 9b9b41242a17c1104d7b93627cb5d4d730e8b7f5
parent d3665d42c668bdf6f4c00b2e5f46c78f0acbeb39
parent 01a1a4b0472f77e856eab6bfe558d63bdc274afb
author Jean-Baptiste Queru <jbq@google.com> 1346263429 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346263429 -0700

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

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