am dc44e06e: am ef664f62: Merge "Fix drm flag setting missed in false drm recognition...

author Jeff Tinker <jtinker@google.com>

Mon, 12 Dec 2011 23:30:16 +0000 (15:30 -0800)

committer Android Git Automerger <android-git-automerger@android.com>

Mon, 12 Dec 2011 23:30:16 +0000 (15:30 -0800)
author Jeff Tinker <jtinker@google.com>
Mon, 12 Dec 2011 23:30:16 +0000 (15:30 -0800)
committer Android Git Automerger <android-git-automerger@android.com>
Mon, 12 Dec 2011 23:30:16 +0000 (15:30 -0800)
diff --cc media/libstagefright/AwesomePlayer.cpp
Simple merge
author	Jeff Tinker <jtinker@google.com>
	Mon, 12 Dec 2011 23:30:16 +0000 (15:30 -0800)
committer	Android Git Automerger <android-git-automerger@android.com>
	Mon, 12 Dec 2011 23:30:16 +0000 (15:30 -0800)