tree 8afe2ecfee471cfd971345cef0a72554de73dd87
parent 48de6ce732a797f5c61186a3e57bec535e37d873
parent f2bab487cc71a8a210ff98d21172d62edcaa6d2a
author Andreas Huber <andih@google.com> 1277395723 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1277395723 -0700

am f2bab487: Merge "Remove now unnecessary property overrides to opt into stagefright." into gingerbread

Merge commit 'f2bab487cc71a8a210ff98d21172d62edcaa6d2a' into gingerbread-plus-aosp

* commit 'f2bab487cc71a8a210ff98d21172d62edcaa6d2a':
  Remove now unnecessary property overrides to opt into stagefright.