tree 87d8ef622dc3d59f79e32d824ce15ca1605f9dd7
parent 8387fc938e044a2bf2840139203af7f9b3884029
parent 6e39bace17ef089beb143f6324807b9d33df366c
author Colin Cross <ccross@android.com> 1389510304 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1389510304 +0000

Merge "Emerson USB ID"