tree d839e488932444b45428558b9f659445ba940e4f
parent 876e28db8b83aab016888226a4b79739ff750e2a
parent 6dbaf573a28d9b77f32c09ddb80f205cc5e54e87
author Steven Thomas <steventhomas@google.com> 1493748371 +0000
committer android-build-merger <android-build-merger@google.com> 1493748371 +0000

Merge "Avoid crash when setting buffer on deleted layer" into oc-dev
am: 6dbaf573a2

Change-Id: I919634ebcd7ff859cd6d52fcc95747810d1fd911