am 6588c7cf: (-s ours) am 5107eea6: Merge "DO NOT MERGE Add support for...
am 6588c7cf: (-s ours) am 5107eea6: Merge "DO NOT MERGE Add support for background scanning" into honeycomb
* commit '6588c7cf':
DO NOT MERGE Add support for background scanning