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:
bbb02f1
b5c6c3d
)
Merge "Fix "launcher starting on work profile"" into oc-dev am: b6d1a19819
author
Makoto Onuki
<omakoto@google.com>
Fri, 19 May 2017 18:01:08 +0000
(18:01 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 19 May 2017 18:01:08 +0000
(18:01 +0000)
am:
b5c6c3daa7
Change-Id: I228d7efd8c283882bb2d431b87ae73da01000156
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