tree 2edd6d2d5d1216c6b4e0a048b4ff7cc733788e08
parent c0384266699aadd23a11bcdfd8a92f6dae8bf36c
parent 78b4977efd365d2ad7c9227c3a89e65ab60c3260
author Jason Simmons <jsimmons@google.com> 1351213566 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351213566 -0700

am 78b4977e: Merge "Ensure that Vector::erase() returns a valid iterator" into jb-mr1-aah-dev

* commit '78b4977efd365d2ad7c9227c3a89e65ab60c3260':
  Ensure that Vector::erase() returns a valid iterator