OSDN Git Service

Merge "Reduce max keymaster message size to 2K" into oc-dev am: 42d61ce03a
authorShawn Willden <swillden@google.com>
Tue, 12 Sep 2017 06:53:16 +0000 (06:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 12 Sep 2017 06:53:16 +0000 (06:53 +0000)
am: ac06f7576e

Change-Id: I219c56653ec9051d35a4c7c8f012c9c06e555881


Trivial merge