commit 2a3d6e1b6cfd2d564a48371598fdc664ea40fa8c
author James Dong <jdong@google.com> Wed Dec 14 13:53:31 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Dec 14 13:53:31 2011 -0800
tree a1031e278f98ee35c02b14f322e4f1f0c60ae9e1
parent 5805f995ef365bf00fcccd5c1f948086c17ec75e
parent 26c2a6bf34b370d467cab4753e5a4b187ba62c0f

am 3f6a7d1e: am d70c64db: 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.

* commit '3f6a7d1ee961a4544563932b7499535dc1cac1ec':
  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.