OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d2af085 bd776a0)
am bd776a0b: am 9824c5da: resolved conflicts for merge of 1adca55f to mnc-dr-dev
authorJason Monk <jmonk@google.com>
Tue, 4 Aug 2015 20:55:37 +0000 (20:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 4 Aug 2015 20:55:37 +0000 (20:55 +0000)
* commit 'bd776a0bb70b1956e3b7332fb75378df85b04a60':
  UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER


Trivial merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help