tree 1242e0bf7eba1e1a017015811a4572231df5cab6
parent 9a1b6b0eb2d8632474fb758a699425df7dd431ee
parent 3946916d56f5f87c002e28970f183931b4ba6310
author Rob Carr <racarr@google.com> 1496793176 +0000
committer android-build-merger <android-build-merger@google.com> 1496793176 +0000

Merge "SurfaceView: Correct inverted alpha detection condition." into oc-dev
am: 3946916d56

Change-Id: Ia2d5ff30183d8588319dc4aa24f5512f3db75e55