tree ae4cb9c9025717ca210bc5ad2a74a71731d7296f
parent a6d2073f7806b0b6e4ebef9401164f2c32f73541
parent a425ebceb7d24785e46f77e8e5464e7e50f45cca
author Andrew Hsieh <andrewhsieh@google.com> 1356716918 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1356716918 -0800

am a425ebce: Merge "Fix a STLport-related crash."

* commit 'a425ebceb7d24785e46f77e8e5464e7e50f45cca':
  Fix a STLport-related crash.