| commit | 13f0768ba993457b6d6875dabc6f5dea692c7a12 | [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 | a4f7155e7d0e10895947a985fd9e447a72f9a5a0 | |
| parent | d329537168fc915ced2ab5ec0efb5586dcfe239e [diff] | |
| parent | 8abaab91b2e54e9208dc253452670372975942e6 [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