diff options
| author | Sergio Giro <sgiro@google.com> | 2015-09-23 17:15:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-23 17:15:12 +0000 |
| commit | c565bdb67b801fe2b4965b44e53dccfd9097993c (patch) | |
| tree | fae97afa559ac30497bf7b5d1df2009236f8dde7 /libutils/VectorImpl.cpp | |
| parent | ec22417993d2a9a98ee957ffc7cd4af95debb546 (diff) | |
| parent | f777655d85af3aefa4a1683f289da1ec67988330 (diff) | |
| download | core-c565bdb67b801fe2b4965b44e53dccfd9097993c.tar.gz core-c565bdb67b801fe2b4965b44e53dccfd9097993c.tar.bz2 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.cpp | 3 |
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 @@ #include <safe_iop.h> #include <utils/Errors.h> -#include <utils/SharedBuffer.h> #include <utils/VectorImpl.h> +#include "SharedBuffer.h" + /*****************************************************************************/ |