tree 03688f30a0df25b900dcc664592d2a29d572de04
parent c37fec6d61dc2650a0a92983dc8d577f9e19520d
parent 3e8bb3ff9ee1478c11408d7164ff7cb5d85f39d0
author Colin Cross <ccross@android.com> 1389510998 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389510998 +0000

am 3e8bb3ff: am e0e7595f: am e76343ef: Merge "Emerson USB ID"

* commit '3e8bb3ff9ee1478c11408d7164ff7cb5d85f39d0':
  Emerson USB ID