tree a4f608e58bb44add010b290e0ad78cce536fc465
parent 8b6d7b063b5a94b59b4a1132763f4644ee1d8545
parent 197fe26940022be75384f4038dd789f446d33122
author Wink Saville <wink@google.com> 1328915680 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328915680 -0800

am 197fe269: Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1

* commit '197fe26940022be75384f4038dd789f446d33122':
  Add OEM specific USB mode enumeration based on ro.bootmode property