OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
49fb13f
1a73ab7
)
am 1a73ab76: am 4bf3dfea: am ffa2d691: Merge "Adds config flag for USB notification...
author
Daniel Koulomzin
<dkoulomzin@google.com>
Thu, 10 Sep 2015 22:06:52 +0000
(22:06 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 10 Sep 2015 22:06:52 +0000
(22:06 +0000)
* commit '
1a73ab760bedd371dbfb8850ac24555c33004ff6
':
Adds config flag for USB notification.
1
2
core/res/res/values/config.xml
patch
|
diff1
|
diff2
|
blob
|
history
core/res/res/values/symbols.xml
patch
|
diff1
|
diff2
|
blob
|
history
services/usb/java/com/android/server/usb/UsbDeviceManager.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/res/res/values/config.xml
Simple merge
diff --cc
core/res/res/values/symbols.xml
Simple merge
diff --cc
services/usb/java/com/android/server/usb/UsbDeviceManager.java
Simple merge
OSDN Git Service
