tree dd06b7efe732f6008367817f015989196a73b380
parent 74600ce304d5910102288f9d1618d3fb134571e4
parent a6b73d36ef8c87c0937ef740456a05126af34bd2
author Elliott Hughes <enh@google.com> 1471455597 +0000
committer android-build-merger <android-build-merger@google.com> 1471455597 +0000

Merge "Be more restrictive about max frame size."
am: a6b73d36ef

Change-Id: I635cae0c7147aad3d6e6a36e889ddc90e1db44d6