tree 30382725c1a3d5874140958adeb0f44bf06b8d17
parent 5df21a184366a5d2e6b0ed7badce5d3019df21ae
parent f59717ddb5ef324ee3fdb12b83e7d1b709793d28
author Mike Lockwood <lockwood@android.com> 1308770666 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1308770666 -0700

Merge changes I9851299e,I4160e73a

* changes:
  Combine UsbManager.setPrimaryFunction and setDefaultFunction
  Fix window leak in UsbPreferenceActivity