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:
00ce770
7e0a00e
)
Merge "Lock access to managed services." into oc-dev am: 8ac1452288
author
Julia Reynolds
<juliacr@google.com>
Fri, 14 Apr 2017 19:03:58 +0000
(19:03 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 14 Apr 2017 19:03:58 +0000
(19:03 +0000)
am:
7e0a00e387
Change-Id: Ibe3e760716ff2ccfbb1432bbe431de33348d8cb0
1
2
services/core/java/com/android/server/notification/ManagedServices.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/notification/ManagedServices.java
Simple merge