diff options
author | 2016-04-28 09:14:32 -0700 | |
---|---|---|
committer | 2016-04-28 09:14:32 -0700 | |
commit | 68a593e7fa07c947fef2c5de53c42e14ed630a8a (patch) | |
tree | 6ae7a67ecfddd080d915a6a3de6f98bfe54a33c4 /libs/gui/IDisplayEventConnection.cpp | |
parent | 53925d208ade2f844f018ed2ca0fb042ce7db85d (diff) | |
parent | 168dc86c261bd7770b99b1803a769eb658f13f96 (diff) |
resolve merge conflicts of 168dc86 to nyc-dev-plus-aosp
Change-Id: I1554cec6ea880a87921f723bc96972cb8e1d3c5c
Diffstat (limited to 'libs/gui/IDisplayEventConnection.cpp')
-rw-r--r-- | libs/gui/IDisplayEventConnection.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/gui/IDisplayEventConnection.cpp b/libs/gui/IDisplayEventConnection.cpp index 9890f44ef7..b1d3b00dbb 100644 --- a/libs/gui/IDisplayEventConnection.cpp +++ b/libs/gui/IDisplayEventConnection.cpp @@ -39,7 +39,7 @@ enum { class BpDisplayEventConnection : public BpInterface<IDisplayEventConnection> { public: - BpDisplayEventConnection(const sp<IBinder>& impl) + explicit BpDisplayEventConnection(const sp<IBinder>& impl) : BpInterface<IDisplayEventConnection>(impl) { } |