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:
84e328c
fe7ff80
)
Merge "Always report a uid's initial cached state." into oc-mr1-dev am: c134dec17f
author
Dianne Hackborn
<hackbod@google.com>
Wed, 2 Aug 2017 18:21:32 +0000
(18:21 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 2 Aug 2017 18:21:32 +0000
(18:21 +0000)
am:
fe7ff804be
Change-Id: I321ab463b66166bebb68389dfb0e03055667ccd2
1
2
services/core/java/com/android/server/am/ActivityManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/am/ActivityStarter.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/ActivityStarter.java
Simple merge
OSDN Git Service
