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:
91693ff
336a7cb
)
Merge \\"Fix VR transition for display on/off sequence.\\" into nyc-dev am: 931a7c03e0
author
Ruben Brunk
<rubenbrunk@google.com>
Thu, 16 Jun 2016 00:42:24 +0000
(
00:42
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 16 Jun 2016 00:42:24 +0000
(
00:42
+0000)
am:
336a7cb9b5
Change-Id: I47d538ee1128a00cab1a7a2e375edf5d9c519cf7
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