| commit | 48747bdd5bb06ce4bdf8f9ac379e0c55a3ee2d6f | [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 | ee48f017fca2899cca7e5a8711fad8386e12f624 | |
| parent | b808af7daf74d27d3c745cd6d62007f344d37e53 [diff] | |
| parent | 6ee7bca1ce7f93d33a70701bb7862c3d13e68b89 [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