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

Browse Source

* commit 'a82d6dc3bf18b74aab4e8fb497b08e02f4a1ec8d':
  libutils: Fix integer overflows in VectorImpl. DO NOT MERGE

...

This commit is contained in:

Narayan Kamath 2015-09-12 08:49:15 +00:00 committed by Android Git Automerger

parent 419e6c3c68 a82d6dc3bf

commit 2e64e9590a

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available