tree d770863589465a7bfcc84488c5591e0c61762df3
parent f149c7679a394cf9aaa00c8b66628b4f8b9d06ff
parent fa4ef344d791e018ec5881c01d99f853203a67dc
author Android Build Merger (Role) <android-build-merger@google.com> 1499739933 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1499739933 +0000

Merge "Merge "DO NOT MERGE Check frame handle validity before freeing buffer." into nyc-dev am: ce2cdf02bd am: c36cdf16a9 am: 389c6ede46 am: fd175e7f88 am: dce2faae4f  -s ours am: 747c025ebf am: c038bb4280" into oc-dr1-dev-plus-aosp