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:
11f83e9
8e2d9d1
)
Merge "Implement new ephemeral resolver design"
author
Todd Kennedy
<toddke@google.com>
Fri, 22 Jul 2016 22:29:15 +0000
(22:29 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Fri, 22 Jul 2016 22:29:17 +0000
(22:29 +0000)
1
2
services/core/java/com/android/server/am/ActivityStarter.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/pm/PackageManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/am/ActivityStarter.java
Simple merge
diff --cc
services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge
OSDN Git Service
