Skip to content
Snippets Groups Projects
Commit 661600dd authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Android Git Automerger
Browse files

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

* commit '110f705e':
  libutils: Fix integer overflows in VectorImpl.
parents 93807d47 110f705e
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
libutils/tests/Vector_test.cpp
+ 2
− 0
View file @ 661600dd
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
#define LOG_TAG "Vector_test" #define LOG_TAG "Vector_test"
#define __STDC_LIMIT_MACROS
#include <stdint.h>
#include <utils/Vector.h> #include <utils/Vector.h>
#include <cutils/log.h> #include <cutils/log.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment