tree 8e3aa07ccd07cb04ad4076e5e989709e85a31df8
parent d14639c3e817be978643d1fbcfb4fac71b7c55dc
parent 9fbe94294ce2053d102ff5de89846a0c5015fb58
author Ed Heyl <ed@google.com> 1343626824 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343626824 -0700

am 9fbe9429: Merge remote-tracking branch \'goog/jb-dev-mako\' into jb-mr1-dev

* commit '9fbe94294ce2053d102ff5de89846a0c5015fb58':
  NuPlayer: Prevents creation of Video Decoder when we use Music Player
  Synchronize access to OMX class member variables
  Merge from jb-dev for "sample video corruption in MediaCodec mode." DO NOT MERGE
  libstagefright: dynamically load libstagefright_chromium_http
  Process EBD and FBD messages in ERROR state
  Add vendor specific output color format