OSDN Git Service

am 0924dd88: am 2aa37a7d: Merge "recordvideo: Add an option for choosing software...
authorJean-Baptiste Queru <jbq@google.com>
Wed, 29 Aug 2012 17:58:21 +0000 (10:58 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Aug 2012 17:58:21 +0000 (10:58 -0700)
* commit '0924dd88790ba9cda0d5a86df7d68b7446470fc7':
  recordvideo: Add an option for choosing software encoders


Trivial merge