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:
aef6cc7
4e9c615
)
Merge \\"Don\\'t re-launch activities while the device is sleeping\\" into nyc-dev...
author
Wale Ogunwale
<ogunwale@google.com>
Thu, 16 Jun 2016 21:41:56 +0000
(21:41 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 16 Jun 2016 21:41:56 +0000
(21:41 +0000)
am:
4e9c615769
Change-Id: I3f3fac134443a475138d279153fd6eccf1b20d9b
1
2
services/core/java/com/android/server/am/ActivityManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
OSDN Git Service
