commit | 891c398d814dee10046f6bd17e594bcff603e30b | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Fri Apr 29 23:31:41 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Apr 29 23:31:41 2016 +0000 |
tree | 0a6e57a358c048243007fd2fd5e8bf1daf4274d7 | |
parent | de3cd66c51f9dbe63ebfd5f001db98deaaa0bfe8 [diff] | |
parent | 644fe318ebfd9f4a69a6a7236073ba9c1500cae5 [diff] |
Merge "Merge "Reject too-large key attestation challenges." into nyc-dev am: 32fabdcc35 am: c262f8001f" into nyc-mr1-dev-plus-aosp