commit 7d39b2d1bfb2abd330ae49719b77ce3715fc8172
author Brian Carlstrom <bdc@google.com> Sun Sep 20 01:02:27 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sun Sep 20 01:02:27 2015 +0000
tree 7575a92c0d995f1789c9acdb8c6ad2b351ec4f06
parent e4ebeb089c0127745521aea0d4bf004e8126df12
parent 96bee4f12bd2b8ef0c614606364a2493d7ee2915

am 110f705e: resolved conflicts for 832a0d1c to mnc-dev

* commit '110f705e1077b388a69814e9cdd2907a6ad7d5bb':
  libutils: Fix integer overflows in VectorImpl.

libutils/tests/Vector_test.cpp

diff --git a/libutils/tests/Vector_test.cpp b/libutils/tests/Vector_test.cpp
index 09914bd..96d3168 100644
--- a/libutils/tests/Vector_test.cpp
+++ b/libutils/tests/Vector_test.cpp
@@ -16,6 +16,8 @@
 
 #define LOG_TAG "Vector_test"
 
+#define __STDC_LIMIT_MACROS
+#include <stdint.h>
 #include <utils/Vector.h>
 #include <cutils/log.h>
 #include <gtest/gtest.h>