| commit | 6f8ddbbbe8ed2ff56a015f503f8d74431eb882dc | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Sun Jan 12 07:16:38 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Jan 12 07:16:38 2014 +0000 |
| tree | 03688f30a0df25b900dcc664592d2a29d572de04 | |
| parent | c37fec6d61dc2650a0a92983dc8d577f9e19520d [diff] | |
| parent | 3e8bb3ff9ee1478c11408d7164ff7cb5d85f39d0 [diff] |
am 3e8bb3ff: am e0e7595f: am e76343ef: Merge "Emerson USB ID" * commit '3e8bb3ff9ee1478c11408d7164ff7cb5d85f39d0': Emerson USB ID