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:
40045ae
8ee3204
)
Merge "Add UID and Service for Secure Element Application" am: b8b7589531
author
Ruchi Kandoi
<kandoiruchi@google.com>
Sat, 27 Jan 2018 01:59:46 +0000
(
01:59
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Sat, 27 Jan 2018 01:59:46 +0000
(
01:59
+0000)
am:
8ee3204c58
Change-Id: I7c74f21e014fb7eb772e2d86cc278fd774ffb8c9
1
2
core/java/android/content/Context.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/am/ActivityManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/pm/PackageManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/content/Context.java
Simple merge
diff --cc
services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
diff --cc
services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge