tree e6521a33bb8ac9aa3e08a859e65015b4605f9443
parent 4cacf1124db6f46a02dcb67cd6d1c3e7fe6daf81
parent 1a8697f91c7f95477e5e1de4580d5b9e5ea3e6fd
author Elliott Hughes <enh@google.com> 1440602960 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440602960 +0000

am 1a8697f9: Merge "Patch android-21 with aarch64 <sys/user.h> fixes."

* commit '1a8697f91c7f95477e5e1de4580d5b9e5ea3e6fd':
  Patch android-21 with aarch64 <sys/user.h> fixes.