tree 5a9088d83e0f5bd5b05c3947d871310ce2aca174
parent 3f6efeaad72bac766351b91d7c47639ca6d08330
parent dc44e06ef305be8de060af69a468e003e231ba05
author Jeff Tinker <jtinker@google.com> 1323732616 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323732616 -0800

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.