tree c0f740645f7918b1a657eb9eeeb9a13575d6d590
parent a7083e0dd29aa5102e25c5a978c072b0a2bf94f4
parent e76343ef72458aff8fdc25c57f4e84407c05a2f2
author Colin Cross <ccross@android.com> 1389510588 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389510588 -0800

am e76343ef: Merge "Emerson USB ID"

* commit 'e76343ef72458aff8fdc25c57f4e84407c05a2f2':
  Emerson USB ID