aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Paul <seanpaul@chromium.org>2016-06-23 04:43:46 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-23 04:43:46 +0000
commitbd1f2172820523848165e8352164e93fee19c366 (patch)
treedeab7ab595f4b333b463e0db7a46e8d9e3f5718a
parent82318646561b4c710ebf554182711dc85454dd38 (diff)
parent6f718d173a7554eb9716c55a95bd00ce3cdc2640 (diff)
downloaddrm_hwcomposer-bd1f2172820523848165e8352164e93fee19c366.tar.gz
Merge \"DO NOT MERGE: drm_hwcomposer: On error, free active composition am: b4cf01b8ea am: 7ca7746261\" into nyc-mr1-dev-plus-aosp
am: 6f718d173a -s ours Change-Id: I7719b53e123ed900ee4d0b090eba59a45437fd64
0 files changed, 0 insertions, 0 deletions