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:
4b655fd
81f3a85
)
am 81f3a85a: Merge "Fix issue #22940169: "pm grant" can no longer grant permissions...
author
Dianne Hackborn
<hackbod@google.com>
Fri, 14 Aug 2015 17:15:33 +0000
(17:15 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 14 Aug 2015 17:15:33 +0000
(17:15 +0000)
* commit '
81f3a85aa29d83ed1a5de4de1006587d375a1c77
':
Fix issue #
22940169
: "pm grant" can no longer grant permissions...
1
2
services/core/java/com/android/server/pm/PackageManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/pm/Settings.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/Settings.java
Simple merge