tree ac4d32cd6d096683d140ed8375449e9e83315377
parent b75939d00fbb3484a0198be49449846d92b942ff
parent 54cfa8364ffa13a1a9a472cea38791ed8c71591a
author Nick Kralevich <nnk@google.com> 1360297776 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360297776 -0800

am 54cfa836: am cfbe0d8f: Merge "Update xattr.h"

# Via Android Git Automerger (1) and others
* commit '54cfa8364ffa13a1a9a472cea38791ed8c71591a':
  Update xattr.h