tree 12e3b7b15f6342deb2c0e7a69a6f3cff303cec63
parent 983740d3f3f12df0cc88907ae2cb35fcc125c267
parent d866ed04ecb7b051b89abe7b479ab73a5c15f094
author Keun-young Park <keunyoung@google.com> 1346779764 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346779764 -0700

am d866ed04: Merge "Remove optional video encoder: MPEG-4 SP" into jb-dev

* commit 'd866ed04ecb7b051b89abe7b479ab73a5c15f094':
  Remove optional video encoder: MPEG-4 SP