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

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

Diff content is not available