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:
8bd3aa7
91add43
)
DO NOT MERGE. Check provider access for content changes.
author
Jeff Sharkey
<jsharkey@android.com>
Fri, 2 Dec 2016 18:19:51 +0000
(18:19 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 2 Dec 2016 18:19:51 +0000
(18:19 +0000)
am:
91add43ae7
Change-Id: I158a5dab0643fb5d2c07393f0df030e93b3c006a
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
