commit d070009ecdb9e8c58ce5d1540d5bcba5587a0448
author Marco Nelissen <marcone@google.com> Thu Mar 20 11:06:54 2014 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 20 11:06:54 2014 -0700
tree f5b30e36b3d0a73bc06a4874af151a1373ed790c
parent 50d36d58369cdf48bc6fcdba96b36c846be8587a
parent df6774c9a3c1460554208925f38dde08953b6d0b

am df6774c9: am 7c1cdbdd: am e23f8b8f: am 1f70863d: am 37b44969: Add support for writing byte arrays to parcels

* commit 'df6774c9a3c1460554208925f38dde08953b6d0b':
  Add support for writing byte arrays to parcels

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: