tree 545c2febeb09dfde98a8c8c9da12038c3d3c0517
parent 94ef1fda8ddd761b2ced012a7a43ce1481f76dc9
parent 479b9f9ddccdfa530de6eb6a38f4b08f2d718aa3
author Steve Pfetsch <spfetsch@google.com> 1477434675 +0000
committer android-build-merger <android-build-merger@google.com> 1477434675 +0000

Merge "Revert "services: surfaceflinger: ASAN fix"" into nyc-mr1-dev am: 103ba31665 am: b3f571bc1e am: 72b05e9e96
am: 479b9f9ddc

Change-Id: Ida277d532ddbb79bdbd44d98d2ec1e3cb8be54e9