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:
ce29c3e
b8b7589
)
Merge "Add UID and Service for Secure Element Application"
author
Ruchi Kandoi
<kandoiruchi@google.com>
Sat, 27 Jan 2018 01:52:33 +0000
(
01:52
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Sat, 27 Jan 2018 01:52:33 +0000
(
01:52
+0000)
am:
b8b7589531
Change-Id: Ib66be1532dd440b1161e6d2d727243fc6b9e614f
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