commit ece207d338bae49294a44bd0cf4cdca89c0bcfb6
author Treehugger Robot <treehugger-gerrit@google.com> Thu Sep 03 23:58:45 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Sep 03 23:58:45 2020 +0000
tree c0c6b99a405c639a82994e45bb73129a561c46df
parent d7badcb4f14d9f3e6bd61e27549713cb6baeae1c
parent 74cdafdfd144c35a63103d1905778c9ddab027ae

Merge changes I7cf1b0d5,Ib9943513,I98e0d91a,I7cb60da1 am: 74cdafdfd1

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1418713

Change-Id: I0b2c007e59ce8c5ffa98c37dcd93c32cb33e87cc

keystore/include/keystore/keystore.h

diff --git a/keystore/include/keystore/keystore.h b/keystore/include/keystore/keystore.h
index f840eb7..ab6c682 100644
--- a/keystore/include/keystore/keystore.h
+++ b/keystore/include/keystore/keystore.h
@@ -59,7 +59,6 @@
     ABORT_CALLED = 18,
     PRUNED = 19,
     BINDER_DIED = 20,
-
 };
 
 /*

keystore/key_attestation_log_handler.h

diff --git a/keystore/key_attestation_log_handler.h b/keystore/key_attestation_log_handler.h
index e69e667..a418bfa 100644
--- a/keystore/key_attestation_log_handler.h
+++ b/keystore/key_attestation_log_handler.h
@@ -23,4 +23,4 @@
 
 }
 
-#endif  //_KEY_ATTESTATION_LOG_HANDLER_H_
\ No newline at end of file
+#endif  //_KEY_ATTESTATION_LOG_HANDLER_H_

keystore/key_operation_log_handler.cpp

diff --git a/keystore/key_operation_log_handler.cpp b/keystore/key_operation_log_handler.cpp
index 140d5a7..e7f4345 100644
--- a/keystore/key_operation_log_handler.cpp
+++ b/keystore/key_operation_log_handler.cpp
@@ -133,4 +133,4 @@
         responseCode);
 }
 
-}  // namespace keystore
+}  // namespace keystore
\ No newline at end of file

keystore/key_operation_log_handler.h

diff --git a/keystore/key_operation_log_handler.h b/keystore/key_operation_log_handler.h
index efd3f00..ba27747 100644
--- a/keystore/key_operation_log_handler.h
+++ b/keystore/key_operation_log_handler.h
@@ -25,4 +25,4 @@
 
 }  // namespace keystore
 
-#endif  // KEY_OPERATION_LOG_HANDLER_H_
+#endif  // KEY_OPERATION_LOG_HANDLER_H_
\ No newline at end of file