tree ba2cf6f33884d479ec8894f911da2036b1ba1f97
parent ad685f0f9fda27ded1c872a243bd96b61c80867e
parent 4db50cec13f5fb69e847d1106c78cb972bc62149
author Pablo Ceballos <pceballos@google.com> 1472493554 +0000
committer android-build-merger <android-build-merger@google.com> 1472493554 +0000

Merge "Fail setDisplaySurface if can't enable async" into nyc-mr1-dev
am: 4db50cec13

Change-Id: I24fc902468e57e81d0e2536eeebf478db302cc63