| commit | 9230bf3b9a321c84c82489b0c471df7e17a3d931 | [log] [tgz] |
|---|---|---|
| author | Irfan Sheriff <isheriff@google.com> | Wed Feb 23 18:06:02 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 23 18:06:02 2011 -0800 |
| tree | 12cdc0f1be3884443d5c93130fb49cd405cbfa64 | |
| parent | 150e24fe4e5dabafd49ecc61dfd1c2b4d1436c1f [diff] | |
| parent | 48f8e8741950f2b4e069dbbd25452182effb275a [diff] |
am 6588c7cf: (-s ours) am 5107eea6: Merge "DO NOT MERGE Add support for background scanning" into honeycomb * commit '6588c7cf73a9d09cad1fa5d4e558a55a5e5e18df': DO NOT MERGE Add support for background scanning