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:
0a6ca96
b3da44d
)
Merge changes from topic "cp_calin_framework_2017" am: b98102b4dc
author
Calin Juravle
<calin@google.com>
Thu, 15 Feb 2018 21:30:27 +0000
(21:30 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 15 Feb 2018 21:30:27 +0000
(21:30 +0000)
am:
b3da44d9a1
Change-Id: Ibd848f6803d63da46ae1461b469422c5a6431980
1
2
core/java/android/content/pm/PackageParser.java
patch
|
diff1
|
diff2
|
blob
|
history
core/res/AndroidManifest.xml
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/PackageParser.java
Simple merge
diff --cc
core/res/AndroidManifest.xml
Simple merge
diff --cc
services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge