OSDN Git Service

am ddb22778: am bd776a0b: am 9824c5da: resolved conflicts for merge of 1adca55f to...
authorJason Monk <jmonk@google.com>
Tue, 4 Aug 2015 21:03:38 +0000 (21:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 4 Aug 2015 21:03:38 +0000 (21:03 +0000)
commit183fcd537023ef0e26cb6cd98d7cda48fdf12f20
tree8496a534179ecee4a6d02826a42b34e7f010529b
parent9390333c84c6218cf70d0750c3f351ff208005f6
parentddb22778100345a5a7bb00153e8e2f5b580c0d24
am ddb22778: am bd776a0b: am 9824c5da: resolved conflicts for merge of 1adca55f to mnc-dr-dev

* commit 'ddb22778100345a5a7bb00153e8e2f5b580c0d24':
  UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER