tree d607897e53146dad20f9570b4de257f6b3d038de
parent c271a8a00e2686c371420406a12fd41c4a97e24d
parent 92aafd3ed5391eb5b172c54e6ea820dd36110c99
author Jason Monk <jmonk@google.com> 1446649367 +0000
committer android-build-merger <android-build-merger@google.com> 1446649367 +0000

Merge "Don\'t show MIDI USB option if not supported" am: c2a9cd03f7
am: 92aafd3ed5

* commit '92aafd3ed5391eb5b172c54e6ea820dd36110c99':
  Don't show MIDI USB option if not supported