tree deb009eea78d8c26d837112a1430a786aea69152
parent 6ade7c2624af7438fa50238f170db4299707c313
parent 5af7cf7c558e6febfa5d48b62900929743d2f7bb
author Irfan Sheriff <isheriff@google.com> 1298960557 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1298960557 -0800

am 5af7cf7c: am f9e2a491: Fix issue to clear scan alarms

* commit '5af7cf7c558e6febfa5d48b62900929743d2f7bb':
  Fix issue to clear scan alarms