tree 3aca9418ee2af5c7c056539f5e649710823e52c7
parent 8b4be231519376c9dc73622be4b8a5ddc0d83805
parent c1ab82ae6b26d12cf6d5cdad1bd0ffc0d3acfb9b
author James Dong <jdong@google.com> 1277405845 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1277405845 -0700

am c1ab82ae: Merge "Use stagefright (instead of OpenCore) authoring engine by default -rebased" into gingerbread

Merge commit 'c1ab82ae6b26d12cf6d5cdad1bd0ffc0d3acfb9b' into gingerbread-plus-aosp

* commit 'c1ab82ae6b26d12cf6d5cdad1bd0ffc0d3acfb9b':
  Use stagefright (instead of OpenCore) authoring engine by default