resolved conflicts for 832a0d1c to mnc-dev

Change-Id: Ic46ee60de7bc500f4e1d5fe841524db80918a8d9

resolved conflicts for 832a0d1c to mnc-dev
110f705e · Brian Carlstrom · c609c31f · 832a0d1c · 110f705e
Commit 110f705e authored 9 years ago by Brian Carlstrom
--- 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>