tree 8f5934e5c190670cf8e9fadcc047a54820328a56
parent 5849c0e4c6f8bf44de44e964ce365c0959070494
parent d6c475dc246b1681f5c9af9e00ac74183812329c
author Elliott Hughes <enh@google.com> 1421112757 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421112757 +0000

am d6c475dc: am 595ae39f: Merge "Use more intention-revealing tests for S_ISLNK and S_ISSOCK."

* commit 'd6c475dc246b1681f5c9af9e00ac74183812329c':
  Use more intention-revealing tests for S_ISLNK and S_ISSOCK.