tree 327df33302482f42a03960029a2f500d934d0ab7
parent cecb710a6de249a3847da2f07464a1aecf9459ac
parent 1b755dea38cc428a4adb8b8954bbafaa9c0441fb
author Jaikumar Ganesh <jaikumar@google.com> 1306529210 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1306529210 -0700

am 1b755dea: Merge "Remove discoverable timeout handler. DO NOT MERGE" into gingerbread

* commit '1b755dea38cc428a4adb8b8954bbafaa9c0441fb':
  Remove discoverable timeout handler. DO NOT MERGE