tree 221f27e3714e2ead7c9edb20247a756610de68c5
parent 518c10c9ba54773bd4d191a65344ee21349f4bc0
parent 4fa3e5ee0db978a89e9571e182ea5a2851a99022
author Andrew Hsieh <andrewhsieh@google.com> 1371848315 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1371848315 -0700

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

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