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

* commit '661600dd0f0bf48289f69915c6b9844436702a90':
  libutils: Fix integer overflows in VectorImpl.
This commit is contained in:
Brian Carlstrom 2015-09-20 01:12:26 +00:00 committed by Android Git Automerger
commit 742d0173e8

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>