diff options
| author | Sergio Giro <sgiro@google.com> | 2015-09-23 17:58:25 +0100 |
|---|---|---|
| committer | Sergio Giro <sgiro@google.com> | 2015-09-23 17:58:25 +0100 |
| commit | f777655d85af3aefa4a1683f289da1ec67988330 (patch) | |
| tree | 450c8b2064bd5a7a4e04a8bb85b784ea0f9048e2 /libutils/VectorImpl.cpp | |
| parent | 64c058da2335b37b7a179fd3ffef5cbf7b5e2a25 (diff) | |
| parent | 6ee734cfa029e7d2d61fe577af23c28cd831b8b6 (diff) | |
resolved conflicts for 6ee734cf to stage-aosp-master
Change-Id: Ia06c4d941d9b8828707299bb363f51fab5549897
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 2f770f590..2ac158b9f 100644 --- a/libutils/VectorImpl.cpp +++ b/libutils/VectorImpl.cpp @@ -23,9 +23,10 @@ #include <cutils/log.h> #include <utils/Errors.h> -#include <utils/SharedBuffer.h> #include <utils/VectorImpl.h> +#include "SharedBuffer.h" + /*****************************************************************************/ |