tree 71a2d43f989e365c43bfaf91683b1587589a29de
parent 52edd8bdf3e83f41f4df4bb5e9e44d0bc0c56a37
parent 2e64e9590a36511eaaf655b24002d24afe927f04
author Narayan Kamath <narayan@google.com> 1442051178 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442051178 +0000

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

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