am 5b485127: am 49520247: am 0904c365: Don\'t advertise metadata mode for VP8 decoder.
authorLajos Molnar <lajos@google.com>
Wed, 30 Apr 2014 12:50:19 +0000 (12:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 12:50:19 +0000 (12:50 +0000)
* commit '5b485127089c591c2744076ac73c10e2fca3da81':


Trivial merge