OSDN Git Service
(root)
/
android-x86
/
frameworks-av.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a9676a8
0c4ec12
)
am 3de8d36b: Reconcile with ics-mr0-release
author
The Android Open Source Project
<initial-contribution@android.com>
Wed, 7 Dec 2011 19:03:56 +0000
(11:03 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 7 Dec 2011 19:03:56 +0000
(11:03 -0800)
* commit '
3de8d36b6fd166cf63ca256c455c0ea26a849668
':
DO NOT MERGE: Remove the AVI extractor.
Disable wifiwatchdog for now
Trivial merge