am 436f03a0: (-s ours) am b851cbc2: am 1a8697f9: Merge "Patch android-21 with aarch64 <sys/user.h> fixes."

* commit '436f03a0800dee1f978d9da87f2696055df43204':
This commit is contained in:
Elliott Hughes
2015-08-27 10:49:11 +00:00
committed by Android Git Automerger

Diff Content Not Available