summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2011-12-14 16:08:46 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-12-14 16:08:46 -0800
commit377d4ae5cbb5304d3bae11a511bd51e2c58db236 (patch)
tree0576dbc6574b352942d762e7d3ec060912dc7d31
parentad2ac95d06e1b283c625cc4bb9f0ab581d98dda3 (diff)
parentb14436d0700f6e837e4d6066ddcf672c61d7f033 (diff)
downloadframeworks_base-377d4ae5cbb5304d3bae11a511bd51e2c58db236.zip
frameworks_base-377d4ae5cbb5304d3bae11a511bd51e2c58db236.tar.gz
frameworks_base-377d4ae5cbb5304d3bae11a511bd51e2c58db236.tar.bz2
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.
0 files changed, 0 insertions, 0 deletions