| commit | 8bdac969e500bc61320a216539e840fe8ad78bb4 | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <ed@google.com> | Sun Jul 29 22:40:24 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Jul 29 22:40:24 2012 -0700 |
| tree | 8e3aa07ccd07cb04ad4076e5e989709e85a31df8 | |
| parent | d14639c3e817be978643d1fbcfb4fac71b7c55dc [diff] | |
| parent | 9fbe94294ce2053d102ff5de89846a0c5015fb58 [diff] |
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