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:
8490ed9
51a89ee
)
Merge "Revert "Fix race condition triggered by quick stop/start of Dream"" into cw...
author
Erik Wolsheimer
<ewol@google.com>
Mon, 5 Jun 2017 21:46:36 +0000
(21:46 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 5 Jun 2017 21:46:36 +0000
(21:46 +0000)
am:
51a89ee90c
Change-Id: I982b94c155849061a667b1bf90f7a511bb81b1c5
1
2
services/core/java/com/android/server/dreams/DreamManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/dreams/DreamManagerService.java
Simple merge