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:
d329537
8abaab9
)
am 6ee7bca1: (-s ours) am 3de8d36b: Reconcile with ics-mr0-release
author
The Android Open Source Project
<initial-contribution@android.com>
Wed, 7 Dec 2011 15:29:38 +0000
(07:29 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 7 Dec 2011 15:29:38 +0000
(07:29 -0800)
* commit '
6ee7bca1ce7f93d33a70701bb7862c3d13e68b89
':
DO NOT MERGE: Remove the AVI extractor.
Disable wifiwatchdog for now
Trivial merge