tree 01c7b58540b618e203474e01a99ffda623ef6a9d
parent eb2ae702aff506f30346ff4bf1c056453859b5f5
parent 206315bc74558d92e1c619616c1b8d2df75f7e2c
author Andrew Hsieh <andrewhsieh@google.com> 1354247029 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354247029 -0800

am 206315bc: Merge "Bug: __WINT_TYPE__ and wint_t reference to different types"

* commit '206315bc74558d92e1c619616c1b8d2df75f7e2c':
  Bug: __WINT_TYPE__ and wint_t reference to different types