tree 2d3cbfa7d89ebdd94f4bf3a4e92665a59384382c
parent 543847b26948c3b2b10c31c0954e3a5040cb6b24
parent b4ebf7f79631726a5b8876e364f8e8da820e07a3
author Irfan Sheriff <isheriff@google.com> 1337291935 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337291935 -0700

am b4ebf7f7: Merge "Remove background scanning" into jb-dev

* commit 'b4ebf7f79631726a5b8876e364f8e8da820e07a3':
  Remove background scanning