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:
2bb4966
fdb3d31
)
Merge "Add timeout to StrictMode flash." into oc-dev
author
Jeff Sharkey
<jsharkey@google.com>
Thu, 8 Jun 2017 05:47:38 +0000
(
05:47
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 8 Jun 2017 05:47:38 +0000
(
05:47
+0000)
am:
fdb3d31504
Change-Id: I646e27241743297d62a5442c845b61ee42b47a2f
1
2
services/core/java/com/android/server/wm/WindowManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/wm/WindowManagerService.java
Simple merge