tree d05c9a88eee46cfce175a52a6467256c1e8b107c
parent 5a71f1a2117f769c1e26b77ccce9199a505c255f
parent 6aa63c2905bb5cbdd0c1c87071e14a0c4185e693
author Craig Donner <cdonner@google.com> 1466008274 +0000
committer android-build-merger <android-build-merger@google.com> 1466008274 +0000

Merge \"Revert \"Handle lock() returning a NULL buffer in SurfaceUtils.\"\" into nyc-dev
am: 6aa63c2905

Change-Id: I9af94f2f7b3c6ac14530331c73b478f3da9585f2