OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8605678
22d12a8
)
Merge "Revert "Workaround alloc-dealloc-mismatch error on ASan device boot."" am...
author
Evgenii Stepanov
<eugenis@google.com>
Mon, 14 Nov 2016 19:58:48 +0000
(19:58 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 14 Nov 2016 19:58:48 +0000
(19:58 +0000)
am:
22d12a89e6
Change-Id: Ie392d157a320fba28e91214af4486d09d671a23a
1
2
services/surfaceflinger/SurfaceFlinger.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/surfaceflinger/SurfaceFlinger.cpp
Simple merge