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:
7f2b4b6
991e493
)
am 991e4936: am cbacd4f0: Merge "Don\'t perform layout while adjusting displays/stack...
author
Filip Gruszczynski
<gruszczy@google.com>
Tue, 1 Sep 2015 23:49:41 +0000
(23:49 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Tue, 1 Sep 2015 23:49:41 +0000
(23:49 +0000)
* commit '
991e493616a644b6bb7fdea9a99990520d77348a
':
Don't perform layout while adjusting displays/stacks state.
1
2
services/core/java/com/android/server/wm/TaskStack.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/wm/WindowManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/wm/TaskStack.java
Simple merge
diff --cc
services/core/java/com/android/server/wm/WindowManagerService.java
Simple merge