am 2e64e959: am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-modular-dev

* commit '2e64e9590a36511eaaf655b24002d24afe927f04':
  libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
This commit is contained in:
Narayan Kamath 2015-09-12 09:46:18 +00:00 committed by Android Git Automerger
commit 68a7837088

Diff content is not available