tree c82e7a0204999d15a575ec78ce095a5b89c63b88
parent 541c25b2e950a6438a265f8c3be62d5556601cc6
parent ceafdd9ba987bc5bf24b7dc3dab9cab79856ab35
author Lajos Molnar <lajos@google.com> 1473445964 +0000
committer android-build-merger <android-build-merger@google.com> 1473445964 +0000

Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into nyc-dev am: f54d735826
am: ceafdd9ba9

Change-Id: I25d737e2db6314d78e995e22cb971ff5037d2796