tree b3eab334eee4368689248b1b69c7161037e893f1
parent 7c26243a3f7087402bf17db82be23a414c529f2b
parent d8ac4fd17a71b8b523121186b8a03212cd5122fe
author Fabien Sanglard <sanglardf@google.com> 1495664371 +0000
committer android-build-merger <android-build-merger@google.com> 1495664371 +0000

Merge "Delete SurfaceFlinger BYPASS codepath" into oc-dev
am: d8ac4fd17a

Change-Id: Ieae1107f4da7b4a3eaa489175bda4bdb62e9d245