am b14436d0: Reconcile with ics-mr1-release

* commit 'b14436d0700f6e837e4d6066ddcf672c61d7f033':
  Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix."    This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.
This commit is contained in:
The Android Open Source Project 2011-12-14 16:08:46 -08:00 committed by Android Git Automerger
commit 1f66f9b411

Diff Content Not Available