tree a1db99bf298baa3f324128517e6ad04443db4f26
parent 6c8d76527c938eb49182a6fd0677ccbc1618e7a8
parent e91e5f6e9db4db5cd53836c901a7f80c11abb55c
author Mike Lockwood <lockwood@android.com> 1299181325 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1299181325 -0800

am e91e5f6e: (-s ours) am c9ac3f51: Merge "DO NOT MERGE: UsbService: Make sure the USB accessory function is disabled when we disconnect" into gingerbread

* commit 'e91e5f6e9db4db5cd53836c901a7f80c11abb55c':
  DO NOT MERGE: UsbService: Make sure the USB accessory function is disabled when we disconnect