commit 45d2b3cc938d5104d96e68e336d5ffa1f69d1383
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Mar 23 00:01:38 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 23 00:01:39 2017 +0000
tree 931e0a1d581b5c98ee63a83f161640878e6982c9
parent 5fa8af3803ae8893c0161c14ec3858d855693b96
parent 634a1aac20ab5970e731c41010520260e7a66c3c

Merge "Add manufacturer and model to device ID attestation"

keystore/include/keystore/keymaster_tags.h

diff --git a/keystore/include/keystore/keymaster_tags.h b/keystore/include/keystore/keymaster_tags.h
index b347dbf..05a33cd 100644
--- a/keystore/include/keystore/keymaster_tags.h
+++ b/keystore/include/keystore/keymaster_tags.h
@@ -86,7 +86,6 @@
 
 using ::android::hardware::hidl_vec;
 using ::android::hardware::Return;
-using ::android::hardware::Status;
 
 // The following create the numeric values that KM_TAG_PADDING and KM_TAG_DIGEST used to have.  We
 // need these old values to be able to support old keys that use them.