Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd776a0b authored by Jason Monk's avatar Jason Monk Committed by Android Git Automerger
Browse files

am 9824c5da: resolved conflicts for merge of 1adca55f to mnc-dr-dev 

* commit '9824c5da':
  UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER
parents 661d1b77 9824c5da
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment