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:
02f38c7
3f2bc41
)
Merge "RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared...
author
Atanas Kirilov
<akirilov@google.com>
Sat, 29 Sep 2018 00:30:48 +0000
(17:30 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Sat, 29 Sep 2018 00:30:48 +0000
(17:30 -0700)
am:
3f2bc41d8b
Change-Id: I73e9ef317927f133497b0fbf2b05f6e1b279f8c0
1
2
services/core/java/com/android/server/pm/PackageManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/pm/PermissionsState.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge
diff --cc
services/core/java/com/android/server/pm/PermissionsState.java
Simple merge
OSDN Git Service
