Merge "Merge "Reduce max keymaster message size to 2K" into oc-dev am: 42d61ce03a am: ac06f7576e am: e5266362e9" into oc-mr1-dev-plus-aosp

am: d6cb9a969b

Change-Id: If557073a55d5464ec8347471fdd108264a3df983
This commit is contained in:
Shawn Willden 2017-09-12 07:00:08 +00:00 committed by android-build-merger
commit b5048b4d0b

Diff content is not available