summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergio Giro2015-09-23 12:15:12 -0500
committerAndroid Git Automerger2015-09-23 12:15:12 -0500
commitc565bdb67b801fe2b4965b44e53dccfd9097993c (patch)
treefae97afa559ac30497bf7b5d1df2009236f8dde7 /libutils/VectorImpl.cpp
parentec22417993d2a9a98ee957ffc7cd4af95debb546 (diff)
parentf777655d85af3aefa4a1683f289da1ec67988330 (diff)
downloadplatform-system-core-c565bdb67b801fe2b4965b44e53dccfd9097993c.tar.gz
platform-system-core-c565bdb67b801fe2b4965b44e53dccfd9097993c.tar.xz
platform-system-core-c565bdb67b801fe2b4965b44e53dccfd9097993c.zip
am f777655d: resolved conflicts for 6ee734cf to stage-aosp-master
* commit 'f777655d85af3aefa4a1683f289da1ec67988330': libutils: hide SharedBuffer by moving SharedBuffer.h to the implementation directory
Diffstat (limited to 'libutils/VectorImpl.cpp')
-rw-r--r--libutils/VectorImpl.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/libutils/VectorImpl.cpp b/libutils/VectorImpl.cpp
index 7c5347299..e8d40ed20 100644
--- a/libutils/VectorImpl.cpp
+++ b/libutils/VectorImpl.cpp
@@ -24,9 +24,10 @@
24#include <safe_iop.h> 24#include <safe_iop.h>
25 25
26#include <utils/Errors.h> 26#include <utils/Errors.h>
27#include <utils/SharedBuffer.h>
28#include <utils/VectorImpl.h> 27#include <utils/VectorImpl.h>
29 28
29#include "SharedBuffer.h"
30
30/*****************************************************************************/ 31/*****************************************************************************/
31 32
32 33