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:
329d20d
f005d55
)
resolved conflicts for f005d55f to master
author
Jeff Hao
<jeffhao@google.com>
Thu, 24 Sep 2015 18:26:48 +0000
(11:26 -0700)
committer
Jeff Hao
<jeffhao@google.com>
Thu, 24 Sep 2015 18:26:48 +0000
(11:26 -0700)
Change-Id: I82027116a2b0bfc8b1ff1e20c3a115a1ba8a19db
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