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:
220f4b8
807e01c
)
Merge "Introduce ONLY_IF_NO_MATCH_FOUND in CrossProfileIntentFilter"
author
Tony Mak
<tonymak@google.com>
Fri, 4 Dec 2015 09:26:35 +0000
(09:26 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Fri, 4 Dec 2015 09:26:35 +0000
(09:26 +0000)
1
2
core/java/android/content/pm/PackageManager.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/pm/PackageManager.java
Simple merge
diff --cc
services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge