tree c2248d698119dabe764e8e24ab77b6cfad6fedca
parent 27200c9949824abec2f09e3d1ec61298fed5f0c7
parent 0e04fe47130add878c12ee4db3c8cf1931efdda8
author Corey Tabaka <eieio@google.com> 1494016979 +0000
committer android-build-merger <android-build-merger@google.com> 1494016979 +0000

Merge changes from topic 'o-compositor-unification' into oc-dev
am: 0e04fe4713

Change-Id: Ie819585288871279d6de56290c7939b1c9ab63aa