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

* commit 'db7d8e963c54246a2792e91c678bbe00fb2cc3aa':
  libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
This commit is contained in:
Narayan Kamath 2015-09-20 00:08:44 +00:00 committed by Android Git Automerger
commit 81b428f27a

Diff content is not available