tree 1ffad313f253a6d83fa51989d930e41b372b31a7
parent 2880284db01d1b80e7119906c16e3d331a53c987
parent c3843157481026469827936e9b16e87878f74f5c
author Lajos Molnar <lajos@google.com> 1473445795 +0000
committer android-build-merger <android-build-merger@google.com> 1473445795 +0000

DO NOT MERGE: IOMX: work against metadata buffer spoofing am: 9a4768f7bf am: da3cba194b am: 61bb7a0d99  -s ours am: 75dd199ec4 am: 7e12739f4b am: c06be67278
am: c384315748  -s ours

Change-Id: If79f739d31e3bede5f6a32d7c6bd01ea17c7e80d