tree 97d9cc853967d554eb3be7b599f0d092175e00e5
parent a9676a82efbec4a46db8e5e58f0f701c7f7d6e05
parent 0c4ec128aa324f99f726a314bd97e8a581f22ec5
author The Android Open Source Project <initial-contribution@android.com> 1323284636 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323284636 -0800

am 3de8d36b: Reconcile with ics-mr0-release

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