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:
2dbac6c
343600c
)
resolve merge conflicts of 44e07e0 to mnc-dev am: 825b713 am: 8c635e7
author
Christopher Tate
<ctate@google.com>
Wed, 20 Apr 2016 21:48:43 +0000
(21:48 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 20 Apr 2016 21:48:43 +0000
(21:48 +0000)
am:
343600c
* commit '
343600c3ecff31826e50d40821927e446adb9b0a
':
Kill the real/isolated uid group, not the ApplicationInfo uid
Change-Id: I68dbf8f280672ec9770b6c57b9a17313f448e14a
1
2
services/core/java/com/android/server/am/ActivityManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/am/ProcessRecord.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
diff --cc
services/core/java/com/android/server/am/ProcessRecord.java
Simple merge