tree 8395d6958c63d46698cc019bae4288856b3cc51c
parent 8aa3c638787d604e09591c6e863ba5dcdfb7893b
parent 2b62ab3e66514f9880f8718ef13804a3f33d7edd
author Marco Nelissen <marcone@google.com> 1461353291 +0000
committer android-build-merger <android-build-merger@google.com> 1461353291 +0000

Merge "DO NOT MERGE More OMX struct checking" into lmp-dev am: a3c7788  -s ours am: 3127286 am: 9385896 am: 7815d4f  -s ours
am: 2b62ab3

* commit '2b62ab3e66514f9880f8718ef13804a3f33d7edd':
  DO NOT MERGE More OMX struct checking

Change-Id: I1f0f3bf39ac8f1503885bcc77d0873eca21b31e7