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

* commit '81b428f27a74f693b7c19b873c3a5a9af69da641':
  libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
This commit is contained in:
Narayan Kamath 2015-09-20 01:00:24 +00:00 committed by Android Git Automerger
commit dd0932e831

Diff Content Not Available