Merge "Fix a STLport-related crash."
diff --git a/stlport/stl/pointers/_tools.h b/stlport/stl/pointers/_tools.h
index 5bb7b25..d9b64e6 100644
--- a/stlport/stl/pointers/_tools.h
+++ b/stlport/stl/pointers/_tools.h
@@ -351,7 +351,10 @@
_IteWrapper(_Iterator &__ite) : _M_ite(__ite) {}
- const_reference operator*() const { return cast_traits::to_storage_type_cref(*_M_ite); }
+ const_reference operator*() const
+ // See http://code.google.com/p/android/issues/detail?id=38630
+ //{ return cast_traits::to_storage_type_cref(*_M_ite); }
+ { return reinterpret_cast<const_reference>(*_M_ite); }
_Self& operator= (_Self const& __rhs) {
_M_ite = __rhs._M_ite;