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:
bc7e15e
9980514
)
Merge \"Compare intent filter when launching adjacent\" into nyc-dev
author
Andrii Kulian
<akulian@google.com>
Tue, 21 Jun 2016 05:27:24 +0000
(
05:27
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 21 Jun 2016 05:27:24 +0000
(
05:27
+0000)
am:
9980514ee0
Change-Id: I8c2b03438fdeed6bce12489c5639245b79097577
1
2
services/core/java/com/android/server/am/ActivityStack.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/am/ActivityStackSupervisor.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/am/ActivityStarter.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/am/ActivityStack.java
Simple merge
diff --cc
services/core/java/com/android/server/am/ActivityStackSupervisor.java
Simple merge
diff --cc
services/core/java/com/android/server/am/ActivityStarter.java
Simple merge