summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergio Giro2015-09-23 11:58:25 -0500
committerSergio Giro2015-09-23 11:58:25 -0500
commitf777655d85af3aefa4a1683f289da1ec67988330 (patch)
tree450c8b2064bd5a7a4e04a8bb85b784ea0f9048e2 /libutils/VectorImpl.cpp
parent64c058da2335b37b7a179fd3ffef5cbf7b5e2a25 (diff)
parent6ee734cfa029e7d2d61fe577af23c28cd831b8b6 (diff)
downloadplatform-system-core-f777655d85af3aefa4a1683f289da1ec67988330.tar.gz
platform-system-core-f777655d85af3aefa4a1683f289da1ec67988330.tar.xz
platform-system-core-f777655d85af3aefa4a1683f289da1ec67988330.zip
resolved conflicts for 6ee734cf to stage-aosp-master
Change-Id: Ia06c4d941d9b8828707299bb363f51fab5549897
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 2f770f590..2ac158b9f 100644
--- a/libutils/VectorImpl.cpp
+++ b/libutils/VectorImpl.cpp
@@ -23,9 +23,10 @@
23#include <cutils/log.h> 23#include <cutils/log.h>
24 24
25#include <utils/Errors.h> 25#include <utils/Errors.h>
26#include <utils/SharedBuffer.h>
27#include <utils/VectorImpl.h> 26#include <utils/VectorImpl.h>
28 27
28#include "SharedBuffer.h"
29
29/*****************************************************************************/ 30/*****************************************************************************/
30 31
31 32