am 5d58cc59: (-s ours) am bb2255ab: am 0904c365: Don\'t advertise metadata mode for...
authorLajos Molnar <lajos@google.com>
Mon, 24 Mar 2014 18:43:48 +0000 (18:43 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 24 Mar 2014 18:43:48 +0000 (18:43 +0000)
* commit '5d58cc59cf7a360cdb7403c3ed85412f3be44ae2':
  Don't advertise metadata mode for VP8 decoder.


Trivial merge