tree 625c21a7688ed613dd22fc9fc9e6c68cec7c44bc
parent 98bfb6f797220818a4018ef5f3aa65fc074c8fc4
parent 7176a61718e7b45a8fde3a25eada0c9425d1dece
author Elliott Hughes <enh@google.com> 1429122992 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429122992 +0000

am 7176a617: Merge "Don\'t use typedefs that hide *s."

* commit '7176a61718e7b45a8fde3a25eada0c9425d1dece':
  Don't use typedefs that hide *s.