tree 101ae9208fa8c4e9a0b704cec6807a95e1152552
parent b1eea45a71a3fffe3014bbe84226df3c57ddbafc
parent 5107eea64e46b0fffbbbcefa469a88044f309de6
author Irfan Sheriff <isheriff@google.com> 1298512965 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1298512965 -0800

am 5107eea6: Merge "DO NOT MERGE Add support for background scanning" into honeycomb

* commit '5107eea64e46b0fffbbbcefa469a88044f309de6':
  DO NOT MERGE Add support for background scanning