OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
661d1b7
9824c5d
)
am 9824c5da: resolved conflicts for merge of 1adca55f to mnc-dr-dev
author
Jason Monk
<jmonk@google.com>
Tue, 4 Aug 2015 20:43:01 +0000
(20:43 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Tue, 4 Aug 2015 20:43:01 +0000
(20:43 +0000)
* commit '
9824c5da1efa9750fb19d477d29875a08289ecf5
':
UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER
Trivial merge