tree e490eb890575902178e77b8d765b9bd9ff444634
parent 14c2823a631b444687b9d26b7baf4c864091c07b
parent cbe19cec6192837582906d885dafe1945d6a7f4c
author Mike Lockwood <lockwood%android.com@gtempaccount.com> 1310496754 -0700
committer Android Code Review <code-review@android.com> 1310496754 -0700

Merge "Add Funai's USB vendor ID to adb."