tree 8fbd9e8faeb9066557a57acf08546ee63e98fa73
parent 126e7fd948ac60462cca61027a976959a88c7f10
parent 98695713bdab3254ce0241eb10d3623d5495f80f
author Craig Donner <cdonner@google.com> 1463423964 +0000
committer android-build-merger <android-build-merger@google.com> 1463423964 +0000

Merge "Handle lock() returning a NULL buffer in SurfaceUtils." into nyc-dev am: d498419257
am: 98695713bd

* commit '98695713bdab3254ce0241eb10d3623d5495f80f':
  Handle lock() returning a NULL buffer in SurfaceUtils.

Change-Id: Iab4f77eda0489a7a37d2b929229f659afbb14e34