tree 9d95db599eacc393a8bfa363e281a16159b00562
parent c027579891ae0755e50c7887e3624469dee0d6be
parent 1a3f2c8c765dba7139a7209f646e1c764c813dd3
author Chris Craik <ccraik@google.com> 1522373587 +0000
committer android-build-merger <android-build-merger@google.com> 1522373587 +0000

Merge "[automerger skipped] Merge "Merge "Prevent transparent region in SurfaceViewSyncTests" into nougat-cts-dev am: c083cb5191" into nougat-mr1-cts-dev am: 309dc6a29f  -s ours" into oreo-cts-dev am: d14410c98b  -s ours am: e218aa74aa  -s ours
am: 1a3f2c8c76  -s ours

Change-Id: I5bfd4bbe9fb05ab8e8decb95b68e452c614f3016