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

* commit '68a7837088c40e367ebf16959adc9d20d06ef0ea':
  libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
This commit is contained in:
Narayan Kamath 2015-09-17 23:03:10 +00:00 committed by Android Git Automerger
commit db7d8e963c

Diff Content Not Available