tree 625c21a7688ed613dd22fc9fc9e6c68cec7c44bc
parent d5cc7099c84197dec330646fae68752fdb87389b
parent 0a557b6bc2a26afd3cb3a2e3dd2fdaf175b09cce
author Elliott Hughes <enh@google.com> 1429125772 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429125772 +0000

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

* commit '0a557b6bc2a26afd3cb3a2e3dd2fdaf175b09cce':
  Don't use typedefs that hide *s.