tree ff0576083d577fd7b113d65970fa23a2d0110658
parent 321e4c9c8fa32b814d59e81fec2c7f07b4861928
parent ccdac700df7089a87e6bf284e45a30a7a6a62602
author Mike Lockwood <lockwood@android.com> 1300152298 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300152298 -0700

am ccdac700: (-s ours) am 78b8e1be: Merge "DO NOT MERGE: backport recent USB accessory changes from honeycomb" into gingerbread

* commit 'ccdac700df7089a87e6bf284e45a30a7a6a62602':
  DO NOT MERGE: backport recent USB accessory changes from honeycomb