commit 50d36d58369cdf48bc6fcdba96b36c846be8587a
author Jean-Baptiste Queru <jbq@google.com> Mon Mar 11 13:00:44 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 11 13:00:44 2013 -0700
tree 788563041118bb8b63b8bb0225227899a39ab7dc
parent 6426bd62676c743b0b5bdc397bcab5c669c6e51f
parent 75bcd737770f85114673c4411b8e2ecc0dd32bdf

am 75bcd737: am 4ddcb758: (-s ours) am 9ef024ec: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '75bcd737770f85114673c4411b8e2ecc0dd32bdf':

include/utils/Vector.h

diff --git a/include/utils/Vector.h b/include/utils/Vector.h
index 7927328..f3020d6 100644
--- a/include/utils/Vector.h
+++ b/include/utils/Vector.h
@@ -188,7 +188,8 @@
      inline void push_back(const TYPE& item)  { insertAt(item, size(), 1); }
      inline void push_front(const TYPE& item) { insertAt(item, 0, 1); }
      inline iterator erase(iterator pos) {
-         return begin() + removeItemsAt(pos-array());
+         ssize_t index = removeItemsAt(pos-array());
+         return begin() + index;
      }
 
 protected: