tree 4df681d5f86e17b2b83b1d917a49a6698b4be5fb
parent 9b31137e0a3d04849355803749e2f65028c3e7df
parent ed5ce4a792bf52639d9b0361302d9149dcb5e50f
author Kevin Hufnagle <khufnagle@google.com> 1468614622 +0000
committer android-build-merger <android-build-merger@google.com> 1468614622 +0000

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

Change-Id: I1f1f767781c93166cb085ebaed32036aee367f05