tree 4c739ed750872366352d946f0fb8982574097ebd
parent 584d2c8ea3573d5c70a21d6907138f911647f05a
parent 109188325c7fb18f9e4cd8db5dd00591c6392e38
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1516747480 +0000
committer android-build-merger <android-build-merger@google.com> 1516747480 +0000

Merge "Reduce max keymaster message size to 2K am: a0b9b39647  -s ours am: 0448a9a2c5  -s ours" into oc-mr1-dev
am: 109188325c  -s ours

Change-Id: If53a9b48d247106f0f4c2fb70a04418e9105ec36