commit | d8cd74f6842c4b28dc625fa45fd7cdb083e5a5f8 | [log] [tgz] |
---|---|---|
author | Mike Lockwood <lockwood@android.com> | Thu Mar 03 11:46:48 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 03 11:46:48 2011 -0800 |
tree | a14464123bebfff64910d7c44b1759a699a6caa8 | |
parent | 09758169898a29ec1d5f08784000caf898e0c4a1 [diff] | |
parent | a4c4fbe3b04b14fe03aee40695c6a2e2e8d44f35 [diff] |
am 86f1c4d3: (-s ours) 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 '86f1c4d3ba53ea11484628081e8e49ca86e897b9': DO NOT MERGE: UsbService: Make sure the USB accessory function is disabled when we disconnect