tree bced3b79268127c012019d70e0c6b12e09e256d1
parent 0f7c0b43056fdc719662971bcde5d2c851e3981a
parent 2b095b74526cf5c9472131452600a02d8a66c32e
author James Dong <jdong@google.com> 1335470607 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1335470607 -0700

am 2b095b74: Merge "Software MPEG4/H263 video encoder is now OMX-based" into jb-dev

* commit '2b095b74526cf5c9472131452600a02d8a66c32e':
  Software MPEG4/H263 video encoder is now OMX-based