am 3de8d36b: Reconcile with ics-mr0-release

Browse Source

* commit '3de8d36b6fd166cf63ca256c455c0ea26a849668':
  DO NOT MERGE: Remove the AVI extractor.
  Disable wifiwatchdog for now

...

This commit is contained in:

The Android Open Source Project

2011-12-07 07:27:57 -08:00

committed by Android Git Automerger

parent 7c92e2dccb 3de8d36b6f

commit 6ee7bca1ce

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available