tree 4fa673151f4b941122da9b01c36a0943731d8007
parent 9d81965dca0fab520c91a3315db64a5b41f524a9
parent c06be67278fa803658ed5c1694846b3fc25d16a7
author Lajos Molnar <lajos@google.com> 1473441266 +0000
committer android-build-merger <android-build-merger@google.com> 1473441266 +0000

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

Change-Id: Ie2f8b1352ab8834afcc92e38114a4e72479b9512