tree 0576dbc6574b352942d762e7d3ec060912dc7d31
parent ad2ac95d06e1b283c625cc4bb9f0ab581d98dda3
parent b14436d0700f6e837e4d6066ddcf672c61d7f033
author The Android Open Source Project <initial-contribution@android.com> 1323907726 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323907726 -0800

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.