Merge changes I9851299e,I4160e73a

* changes:
  Combine UsbManager.setPrimaryFunction and setDefaultFunction
  Fix window leak in UsbPreferenceActivity
This commit is contained in:
Mike Lockwood 2011-06-22 12:24:26 -07:00 committed by Android (Google) Code Review
commit b4a4a3de4c

Diff Content Not Available