tree 1e25fe2d0ebb7de714a745360661771dbd17e5e7
parent 5f0702849996f43df78e71fbfb1b6919e90d78f5
parent 5a5cc3dcb054716803401149aa1eee0d3cd4a19c
author Jesse Hall <jessehall@google.com> 1360297769 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360297769 -0800

am 5a5cc3dc: am bc18fe85: am fd1c028e: Merge "Handle hotplug events as described instead of rescanning"

# Via Android Git Automerger (2) and Gerrit Code Review (2)
* commit '5a5cc3dcb054716803401149aa1eee0d3cd4a19c':
  Handle hotplug events as described instead of rescanning