tree a135d289a1ebbd5d546198f39a0b726448bc1a4c
parent 91173bc7e6bdd8f4c769fcbb5e73ceee62153646
parent 21eecc88d53c70968ec4003b54d722f0ede00d76
author Kevin Hufnagle <khufnagle@google.com> 1465874045 +0000
committer android-build-merger <android-build-merger@google.com> 1465874045 +0000

Merge \"Merge \\\"docs: Expanded description of \\\"Key Attestation\\\" N Preview feature.\\\" into nyc-dev am: f6250cc7df am: 697b44a552\" into nyc-mr1-dev-plus-aosp
am: 21eecc88d5

Change-Id: Id66550c43ff8c3a94ca992b51ea2e3af4258c555