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:
06a49b1
59f0569
)
Merge "Show crash/ANR dialogs on userdebug watch builds" into nyc-mr1-dev
author
Erik Wolsheimer
<ewol@google.com>
Wed, 1 Jun 2016 20:39:44 +0000
(20:39 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Wed, 1 Jun 2016 20:39:46 +0000
(20:39 +0000)
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