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:
af25a26
7635669
)
Merge \\\"Do not schedule restarts if the system is shutting down\\\" into nyc-dev...
author
Fyodor Kupolov
<fkupolov@google.com>
Fri, 17 Jun 2016 21:35:12 +0000
(21:35 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 17 Jun 2016 21:35:12 +0000
(21:35 +0000)
am:
7635669ec4
Change-Id: Ib7a85c51f7e8041a4364d6a34deda0088439ca71
1
2
services/core/java/com/android/server/am/ActivityManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/am/ActivityRecord.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
diff --cc
services/core/java/com/android/server/am/ActivityRecord.java
Simple merge