tree 076e5023f811a5b219fe6179a1e9f5dd04fedd1c
parent e8966b349f5f527bf17d2cd6c85eb5ec42d9cab6
parent 40cd45151513ecc02c95e0cc1b40480dd816cdd4
author Jason Simmons <jsimmons@google.com> 1351213683 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351213683 -0700

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

* commit '40cd45151513ecc02c95e0cc1b40480dd816cdd4':
  Ensure that Vector::erase() returns a valid iterator