| commit | 36d4f8f2a5929d181deccb73332372b0a412bea6 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Dec 07 07:29:38 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 07 07:29:38 2011 -0800 |
| tree | 9d54b94b6a9b0fcfb456ae05e21953e8ea97d9f0 | |
| parent | 44bec2e1e2072ebaeeb96bde2c639c48beae1bf9 [diff] | |
| parent | 1b37b40f3c39863ecc6c404b177fc0c961f32dce [diff] |
am 6ee7bca1: (-s ours) am 3de8d36b: Reconcile with ics-mr0-release * commit '6ee7bca1ce7f93d33a70701bb7862c3d13e68b89': DO NOT MERGE: Remove the AVI extractor. Disable wifiwatchdog for now