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:
d6a5f68
5c53e1b
)
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5
author
Sudheer Shanka
<sudheersai@google.com>
Mon, 19 Sep 2016 22:35:55 +0000
(22:35 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 19 Sep 2016 22:35:55 +0000
(22:35 +0000)
am:
5c53e1b8bb
Change-Id: Icd67597290378b8b62328cbfafa35fd0fc0497b6
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
index
df6ccab
,
19f8445
..
eb5aebf
mode 100644,100755..100644
---
1
/
services/core/java/com/android/server/am/ActivityManagerService.java
---
2
/
services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/
services/core/java/com/android/server/am/ActivityManagerService.java
OSDN Git Service
