tree 4fa673151f4b941122da9b01c36a0943731d8007
parent fdd84ef1035e4ca7f0659adfdfa0dd9e6a83dcdc
parent ca6191e9f3a7cbaa934241c7daf9b873965add2d
author Lajos Molnar <lajos@google.com> 1473441768 +0000
committer android-build-merger <android-build-merger@google.com> 1473441768 +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

Change-Id: Iaf5634aef3dee8b3bcc21ddfa34a1f297d1b17c3