tree 824c94e2406daf3ff7c21646a882f9d6f03c1c5e
parent 5c7a3e48672603ed013265bc15e3cd64da6683b3
parent 68b98bc608d3562751bf1a7fc765cce6d8e4befa
author Kevin Hufnagle <khufnagle@google.com> 1468608992 +0000
committer android-build-merger <android-build-merger@google.com> 1468608992 +0000

Merge \"docs: Added note about limited support for hardware key attestation\" into nyc-dev
am: 68b98bc608

Change-Id: I07e7c0a91f7e75d5713b93aa27c06ef2631ea276