am 16bed965: am 742d0173: am 661600dd: am 110f705e: resolved conflicts for 832a0d1c to mnc-dev

* commit '16bed9650aa493194b4091700ac81c9c882d96b2':
  libutils: Fix integer overflows in VectorImpl.
This commit is contained in:
Brian Carlstrom 2015-09-20 01:25:14 +00:00 committed by Android Git Automerger
commit 7ae1d6590b

View file

@ -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>