am 6ee7bca1: (-s ours) am 3de8d36b: Reconcile with ics-mr0-release

Browse Source

* commit '6ee7bca1ce7f93d33a70701bb7862c3d13e68b89':
  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:29:38 -08:00 committed by Android Git Automerger

parent d329537168 8abaab91b2

commit 13f0768ba9

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

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

Diff Content Not Available