diff options
| author | 2016-04-28 09:14:32 -0700 | |
|---|---|---|
| committer | 2016-04-28 09:14:32 -0700 | |
| commit | 68a593e7fa07c947fef2c5de53c42e14ed630a8a (patch) | |
| tree | 6ae7a67ecfddd080d915a6a3de6f98bfe54a33c4 /libs/binder/BufferedTextOutput.cpp | |
| parent | 53925d208ade2f844f018ed2ca0fb042ce7db85d (diff) | |
| parent | 168dc86c261bd7770b99b1803a769eb658f13f96 (diff) | |
resolve merge conflicts of 168dc86 to nyc-dev-plus-aosp
Change-Id: I1554cec6ea880a87921f723bc96972cb8e1d3c5c
Diffstat (limited to 'libs/binder/BufferedTextOutput.cpp')
| -rw-r--r-- | libs/binder/BufferedTextOutput.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/binder/BufferedTextOutput.cpp b/libs/binder/BufferedTextOutput.cpp index 1339a67e62..a2443c081f 100644 --- a/libs/binder/BufferedTextOutput.cpp +++ b/libs/binder/BufferedTextOutput.cpp @@ -34,7 +34,7 @@ namespace android { struct BufferedTextOutput::BufferState : public RefBase { - BufferState(int32_t _seq) + explicit BufferState(int32_t _seq) : seq(_seq) , buffer(NULL) , bufferPos(0) |