OSDN Git Service

am 183fcd53: am ddb22778: am bd776a0b: am 9824c5da: resolved conflicts for merge...
authorJason Monk <jmonk@google.com>
Tue, 4 Aug 2015 21:10:14 +0000 (21:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 4 Aug 2015 21:10:14 +0000 (21:10 +0000)
commitb3e81e100491cce1105d5eb05fb604de66077a65
tree444026091b8a3599d80aa00ae7da9aa785c40051
parent5d402d59bc0873e9f8b9a16311289df2f604b1f7
parent183fcd537023ef0e26cb6cd98d7cda48fdf12f20
am 183fcd53: am ddb22778: am bd776a0b: am 9824c5da: resolved conflicts for merge of 1adca55f to mnc-dr-dev

* commit '183fcd537023ef0e26cb6cd98d7cda48fdf12f20':
  UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER