Mike Lockwood 181735a8d5 Merge changes I9851299e,I4160e73a
* changes:
  Combine UsbManager.setPrimaryFunction and setDefaultFunction
  Fix window leak in UsbPreferenceActivity
2011-06-22 12:24:26 -07:00
..