OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f4b0a36
12d3448
)
am b14436d0: Reconcile with ics-mr1-release
author
The Android Open Source Project
<initial-contribution@android.com>
Thu, 15 Dec 2011 00:08:46 +0000
(16:08 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 15 Dec 2011 00:08:46 +0000
(16:08 -0800)
* 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
.
Trivial merge