OSDN Git Service

am 6ee7bca1: (-s ours) am 3de8d36b: Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 7 Dec 2011 15:29:38 +0000 (07:29 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 7 Dec 2011 15:29:38 +0000 (07:29 -0800)
commit13f0768ba993457b6d6875dabc6f5dea692c7a12
treea4f7155e7d0e10895947a985fd9e447a72f9a5a0
parentd329537168fc915ced2ab5ec0efb5586dcfe239e
parent8abaab91b2e54e9208dc253452670372975942e6
am 6ee7bca1: (-s ours) am 3de8d36b: Reconcile with ics-mr0-release

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