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

* commit 'dd0932e831551d0a57a8af646ac0f9f386e4f579':
  libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
This commit is contained in:
Narayan Kamath 2015-09-20 01:10:09 +00:00 committed by Android Git Automerger
commit 222a15622a

Diff content is not available