tree 9d4410dbf5a1b15a29307b90ee0b47499d4fdc41
parent d39deac4a664121bae98806f262857b59d46ddc7
parent 25be7400a9b0cf205a2188663e137610feb12111
author Andrew Hsieh <andrewhsieh@google.com> 1354716304 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354716304 -0800

am 25be7400: Merge "Fix a ENOTUP/ENOTSUP typo"

* commit '25be7400a9b0cf205a2188663e137610feb12111':
  Fix a ENOTUP/ENOTSUP typo