tree 74846552e06dabe3db2f4bce8006f46b1fac23ab
parent 74e8693d310d75e98c5cf62340612d474f6f197b
parent bc18fe851c98dbe6be4eb2655efb1ef95902d961
author Jesse Hall <jessehall@google.com> 1360297583 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360297583 -0800

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

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