OSDN Git Service

am 3de8d36b: Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 7 Dec 2011 15:27:57 +0000 (07:27 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 7 Dec 2011 15:27:57 +0000 (07:27 -0800)
commit1b37b40f3c39863ecc6c404b177fc0c961f32dce
treeebca213f22bc3adee2b0c9efd3fb0aedef86918b
parentfcab2a8d5644875361f39f271fa9ffde59709c07
parent0c4ec128aa324f99f726a314bd97e8a581f22ec5
am 3de8d36b: Reconcile with ics-mr0-release

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