OSDN Git Service

am dc44e06e: am ef664f62: Merge "Fix drm flag setting missed in false drm recognition...
authorJeff Tinker <jtinker@google.com>
Mon, 12 Dec 2011 23:30:16 +0000 (15:30 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Dec 2011 23:30:16 +0000 (15:30 -0800)
commitfec2284d520fa2856358692095a715678225abcb
tree1218ef21e382416724a8d29a820b9680ac57030f
parentd1b9f44fccd387abbc42b6923b2b06ac7db1aa05
parent736d8141e8f060c79c297c5447cdbe2c7fa9e231
am dc44e06e: am ef664f62: Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1

* commit 'dc44e06ef305be8de060af69a468e003e231ba05':
  Fix drm flag setting missed in false drm recognition fix.
media/libstagefright/AwesomePlayer.cpp