tree 39c858f8e973cc965ce0ef6d53216aace55e1eef
parent 23d2a2e07a38589ab054ad8e143cf92126d4b10b
parent 2c98a3b273cdb6d45df2fca95d5d3fa9ea81684b
author Ray Essick <essick@google.com> 1499720399 +0000
committer android-build-merger <android-build-merger@google.com> 1499720399 +0000

Merge "Merge "Check frame handle validity before freeing buffer." into oc-dev am: c9d2ceb9c2 am: 41779c4849" into oc-dr1-dev-plus-aosp
am: 2c98a3b273

Change-Id: Iff1cc173408728da87f882b46ebbf6a89212b5c0