tree 274def25a0c059f063e3bfe0007298dd0c7d1d50
parent d2ab607485542b3e273d945ce423399cea763b52
parent 1c842b26ebbf64d15b6015b9a03d888829b946ef
author Andreas Huber <andih@google.com> 1283198815 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283198815 -0700

am 681c5ff2: Merge "Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore." into gingerbread

Merge commit '681c5ff2085a08835c08b97641ebdc1b37489943' into gingerbread-plus-aosp

* commit '681c5ff2085a08835c08b97641ebdc1b37489943':
  Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore.