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:
bac1337
07c6628
)
resolve merge conflicts of 07c6628d68 to master.
author
Jeff Sharkey
<jsharkey@android.com>
Fri, 30 Oct 2015 22:44:58 +0000
(15:44 -0700)
committer
Jeff Sharkey
<jsharkey@android.com>
Fri, 30 Oct 2015 22:44:58 +0000
(15:44 -0700)
Change-Id: I29c9b408956c578ce1cfe0eb5d8704b7a5d2f818
1
2
services/core/java/com/android/server/pm/PackageManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge
OSDN Git Service
