tree 457a7c9c5bb43510ae709f9ef87ce50d2f27a79e
parent 55ed7e34b981e9725f664587c6ca1f43d78c3f6e
parent 9064a48365c131ef5f64b26ab33dd40a7d1246a7
author Mike Lockwood <lockwood@google.com> 1344915762 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1344915762 -0700

am 9064a483: Merge "Added missing USB_DEVICE_ATTACHED broadcast to running Activity"

* commit '9064a48365c131ef5f64b26ab33dd40a7d1246a7':
  Added missing USB_DEVICE_ATTACHED broadcast to running Activity