From: The Android Open Source Project <initial-contribution@android.com>
Date: Wed, 7 Dec 2011 15:29:38 +0000 (-0800)
Subject: am 6ee7bca1: (-s ours) am 3de8d36b: Reconcile with ics-mr0-release
X-Git-Tag: android-x86-4.4-r1~1579^2~385
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=36d4f8f2a5929d181deccb73332372b0a412bea6;p=android-x86%2Fframeworks-av.git

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

* commit '6ee7bca1ce7f93d33a70701bb7862c3d13e68b89':
  DO NOT MERGE: Remove the AVI extractor.
  Disable wifiwatchdog for now
---

36d4f8f2a5929d181deccb73332372b0a412bea6