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:
4426aa9
6a3706a
)
Removed screen on/off callbacks from NPMS. am: f8dd7b4e8d
author
Felipe Leme
<felipeal@google.com>
Fri, 19 Aug 2016 23:01:27 +0000
(23:01 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 19 Aug 2016 23:01:27 +0000
(23:01 +0000)
am:
6a3706a08c
Change-Id: I025326d7b89a60920c0db3aa6e363541974cd204
1
2
services/core/java/com/android/server/net/NetworkPolicyManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
services/java/com/android/server/SystemServer.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/net/NetworkPolicyManagerService.java
Simple merge
diff --cc
services/java/com/android/server/SystemServer.java
Simple merge
OSDN Git Service
