tree 4574976896b5a774eee1a351ad6104f1f29117ef
parent 890ef9f40f05d1c3a335100bc3d0085c051ff43c
parent fc936d5a6e993b2a6c201016b6ae6d7795644dce
author Lajos Molnar <lajos@google.com> 1473441094 +0000
committer android-build-merger <android-build-merger@google.com> 1473441094 +0000

DO NOT MERGE: IOMX: work against metadata buffer spoofing am: 86369364a0  -s ours am: 97f82679d8 am: 2815b127e0 am: 8eca7511cc  -s ours am: 6d54c422cf
am: fc936d5a6e

Change-Id: Ibf0809749f082b1fa886e52495296d853fcc1fd6