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:
f41768c
3333f8a
)
am 3333f8af: Merge "DO NOT MERGE UsbManager: squashed commit of:" into gingerbread
author
Mike Lockwood
<lockwood@android.com>
Mon, 28 Feb 2011 21:17:58 +0000
(13:17 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Mon, 28 Feb 2011 21:17:58 +0000
(13:17 -0800)
* commit '
3333f8afb2d1eae8bfdb41fa87f86836ad8702f7
':
DO NOT MERGE UsbManager: squashed commit of:
1
2
services/java/com/android/server/NotificationManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/java/com/android/server/NotificationManagerService.java
Simple merge
OSDN Git Service
