tree 4fa673151f4b941122da9b01c36a0943731d8007
parent a8b097e78e8eb308631d59f7235260ddd0ff57a1
parent 8c02795ab67d253f890f770d0e80bbc25fa53efa
author Lajos Molnar <lajos@google.com> 1473441769 +0000
committer android-build-merger <android-build-merger@google.com> 1473441769 +0000

Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into klp-dev am: 425cc025a1 am: 9c7f0824be am: 56100a30ba  -s ours am: 563b100957  -s ours am: 4636e7256a am: 44071d00a7 am: f95caa3506  -s ours am: 483c0d4053 am: 43d4b759f5
am: 8c02795ab6

Change-Id: Ib681241f120229cad6295890f659b6f31e4c11b6