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:
3b01d0a
d3dc917
)
Merge "DO NOT MERGE Revert "Show dialog if top app is killed by lmk"" into oc-mr1-dev
author
Zhi An Ng
<zhin@google.com>
Tue, 17 Oct 2017 20:16:02 +0000
(20:16 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 17 Oct 2017 20:16:02 +0000
(20:16 +0000)
am:
d3dc9171d4
Change-Id: I6bf6797bdf92bfef0f4f8e23a394eaa7646460c0
1
2
core/res/res/values/strings.xml
patch
|
diff1
|
diff2
|
blob
|
history
core/res/res/values/symbols.xml
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/am/ActivityManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/res/res/values/strings.xml
Simple merge
diff --cc
core/res/res/values/symbols.xml
Simple merge
diff --cc
services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
OSDN Git Service
