tree 65d54f27d01d2e7895fec8dc78a4ef78107587cc
parent 6a40e395b6e0543875205ebfa081992e496d3b3f
parent 7d4b717b3b48998a13070b383a98c972aec00781
author Andrew Hsieh <andrewhsieh@google.com> 1356716914 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1356716914 -0800

am 7d4b717b: Merge "Remove wchar_t-related compiler warnings when building the STLport sources"

* commit '7d4b717b3b48998a13070b383a98c972aec00781':
  Remove wchar_t-related compiler warnings when building the STLport sources