tree a1344079c6e66a464ce69d7d7ad56fc4bb56af74
parent 8e6f821e733e075086cb80309717e3a85e2a9c37
parent d891654b0ccb27e39c1e8dd3d0c1d2adb62f0092
author James Dong <jdong@google.com> 1277405740 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1277405740 -0700

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