| commit | 823a5073888b6d7d7eb6303414a06a5135007702 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 21:42:13 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:42:13 2015 +0000 |
| tree | 56cc0f56d67b13b3787f6421581f1353f356c678 | |
| parent | cdacad532c2b71a3e71d25eff7c7396a5f94f78c [diff] | |
| parent | 1f706c7edbb6843aa284c69226186f644ade7024 [diff] |
am 1f706c7e: am 436f03a0: (-s ours) am b851cbc2: am 1a8697f9: Merge "Patch android-21 with aarch64 <sys/user.h> fixes." * commit '1f706c7edbb6843aa284c69226186f644ade7024':