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:
1b24ad6
c5e289d
)
Merge "Workaround launching PiP task with CLEAR_TASK & NEW_TASK flag." into oc-dev
author
Winson Chung
<winsonc@google.com>
Thu, 4 May 2017 16:21:30 +0000
(16:21 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 4 May 2017 16:21:30 +0000
(16:21 +0000)
am:
c5e289d479
Change-Id: I11edbc227141a31fddef985c7d94cc77ffb6ae80
1
2
services/core/java/com/android/server/am/ActivityManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge