commit 639746c103e0f1261d4c461d14c1457ab75fe401
author Chih-Hung Hsieh <chh@google.com> Mon Apr 25 21:26:36 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Apr 25 21:26:36 2016 +0000
tree 038215acf03de60e9444ed6bea0c2bf59e77c22a
parent 6f4a37ad32ab3c5701689ce70bf1e1c7b4983804
parent 997662290cae89be86c7b3a7264e27d896c1d96c

Merge "Fix google-explicit-constructor warnings." am: e218406 am: e44c337
am: 9976622

* commit '997662290cae89be86c7b3a7264e27d896c1d96c':
  Fix google-explicit-constructor warnings.

Change-Id: I79a2342614a4dedba0968d9b3c663abefe76bfd0

keystore/IKeystoreService.cpp

diff --git a/keystore/IKeystoreService.cpp b/keystore/IKeystoreService.cpp
index 384e423..fc2280e 100644
--- a/keystore/IKeystoreService.cpp
+++ b/keystore/IKeystoreService.cpp
@@ -455,7 +455,7 @@
 class BpKeystoreService: public BpInterface<IKeystoreService>
 {
 public:
-    BpKeystoreService(const sp<IBinder>& impl)
+    explicit BpKeystoreService(const sp<IBinder>& impl)
         : BpInterface<IKeystoreService>(impl)
     {
     }