tree 0a6e57a358c048243007fd2fd5e8bf1daf4274d7
parent a4c73ab5cd81642de4b66c4e3ab8b5485bc728e5
parent 891c398d814dee10046f6bd17e594bcff603e30b
author Shawn Willden <swillden@google.com> 1461972863 +0000
committer android-build-merger <android-build-merger@google.com> 1461972863 +0000

Merge "Merge "Reject too-large key attestation challenges." into nyc-dev am: 32fabdcc35 am: c262f8001f" into nyc-mr1-dev-plus-aosp
am: 891c398d81

* commit '891c398d814dee10046f6bd17e594bcff603e30b':

Change-Id: I527a6756846239cd4a77c06abe97765ffef38c72