tree 3ffc04aaa6455a80ccdb517774aa88e7a26a0264
parent d1e3315b12e1e7bcbfe1bd116c527d0a30a6a925
parent b6e483bbd27f506d37097c9db79d78b54ef0fc5f
author Yin-Chia Yeh <yinchiayeh@google.com> 1555622368 -0700
committer android-build-merger <android-build-merger@google.com> 1555622368 -0700

Merge "Camera: don't enable buffer manager for display/texture streams" into qt-dev am: 68b8684c8e
am: b6e483bbd2

Change-Id: Ief68b2adf5ded5b2936289527848e943423dc70c