tree 1218ef21e382416724a8d29a820b9680ac57030f
parent d1b9f44fccd387abbc42b6923b2b06ac7db1aa05
parent 736d8141e8f060c79c297c5447cdbe2c7fa9e231
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.