tree 6759d4221bd6976048f8f281c6f864c2387a03e7
parent 97f82679d8b02ef62efdb90353fc02d7789f88eb
parent 6981afc6acd9984150526ef5abb483bea6d213d9
author Lajos Molnar <lajos@google.com> 1473440206 +0000
committer android-build-merger <android-build-merger@google.com> 1473440206 +0000

Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into lmp-dev
am: 6981afc6ac  -s ours

Change-Id: I1987358c9b524bc1bd3863f0653947ba7d09407e