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:
319d6c0
5ae6107
)
Merge "Only user whitelist gets allow_while_idle_unrestricted" into pi-dev am: 3d70d20c88
author
Suprabh Shukla
<suprabh@google.com>
Fri, 25 May 2018 19:38:55 +0000
(12:38 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 25 May 2018 19:38:55 +0000
(12:38 -0700)
am:
5ae610751f
Change-Id: Ica6f802d6ff6254a70feee45bc20a9f50617c68a
1
2
services/core/java/com/android/server/AlarmManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/AlarmManagerService.java
Simple merge