commit | ccfa8988bbff5531c6d131ee25ae0881d6e05f2f | [log] [tgz] |
---|---|---|
author | Colin Cross <ccross@android.com> | Sun Jan 12 07:20:13 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sun Jan 12 07:20:13 2014 +0000 |
tree | 4e080dc79fc9f21ae3be6682bb9abd232ee3e9fb | |
parent | 6e9c19906a86ad500dbb46c9e5c93b14bba1ece9 [diff] | |
parent | 6f8ddbbbe8ed2ff56a015f503f8d74431eb882dc [diff] |
am 6f8ddbbb: am 3e8bb3ff: am e0e7595f: am e76343ef: Merge "Emerson USB ID" * commit '6f8ddbbbe8ed2ff56a015f503f8d74431eb882dc': Emerson USB ID