tree ede61802dcaef07a9caf9c5712267fcad84d8a45
parent ca71e0f9da8c77f9c13e38e1b26f530df3925afa
parent ae9621de63000a4c54e95fc9424f7a02f2d9af9a
author Andrew Hsieh <andrewhsieh@google.com> 1371847971 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1371847971 -0700

am ae9621de: Merge "Fix wchar.h not to redefine WCHAR_MAX/WCHAR_MIN"

* commit 'ae9621de63000a4c54e95fc9424f7a02f2d9af9a':
  Fix wchar.h not to redefine WCHAR_MAX/WCHAR_MIN