tree 1ffad313f253a6d83fa51989d930e41b372b31a7
parent 9bb785b7a6249e505a1f09b61aacc864b8343e9e
parent a8b097e78e8eb308631d59f7235260ddd0ff57a1
author Lajos Molnar <lajos@google.com> 1473445855 +0000
committer android-build-merger <android-build-merger@google.com> 1473445855 +0000

DO NOT MERGE: IOMX: work against metadata buffer spoofing am: 807e827d4c am: ee9effab3d am: c5251a627c  -s ours am: 18f84821f6  -s ours am: a6d4a2a14c am: 6048921526 am: 638ae0ac2c  -s ours am: 3b1730dd5d am: 825bf7bc32 am: ca6191e9f3
am: a8b097e78e  -s ours

Change-Id: I5d79177c88b95e272e4208541c5d099e3e51cf46