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:
ca7e024
a336d8a
)
Merge "Merge "Prevent crash dialogs from appearing in demo mode" into oc-dr1-dev...
author
Christine Franks
<christyfranks@google.com>
Thu, 3 Aug 2017 00:55:15 +0000
(
00:55
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 3 Aug 2017 00:55:15 +0000
(
00:55
+0000)
am:
a336d8a57b
Change-Id: I7bc11d9f0dca717c850c0de3f86dcc835e0f92ca
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