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:
358ec57
5dbe26f
)
Merge "Add PID info into ANR crash log header" am: 2fe972c822 am: 5d57502c89
author
Tsukasa Hashimoto
<tsukasa.x.hashimoto@sonymobile.com>
Fri, 14 Apr 2017 18:19:22 +0000
(18:19 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 14 Apr 2017 18:19:22 +0000
(18:19 +0000)
am:
5dbe26f0f1
Change-Id: I692162bdee8a93d49cd41967939aaab9f4c33224
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