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:
5abc583
092d675
)
Merge "Prevent non-fullscreen activities from triggering auto-enter PiP" into oc...
author
Winson Chung
<winsonc@google.com>
Wed, 12 Jul 2017 22:16:47 +0000
(22:16 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 12 Jul 2017 22:16:47 +0000
(22:16 +0000)
am:
092d675192
Change-Id: I51c5a575c0700879af80a0ecd688f4f0de0eae72
1
2
services/core/java/com/android/server/am/ActivityStack.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/am/ActivityStack.java
Simple merge