| commit | 1f706c7edbb6843aa284c69226186f644ade7024 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 10:49:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 10:49:11 2015 +0000 |
| tree | a9bd744a02518ed863e493d3c55e3be526091dfd | |
| parent | 9dc995d5f471304d94176d9587f7202dd325a0ed [diff] | |
| parent | 436f03a0800dee1f978d9da87f2696055df43204 [diff] |
am 436f03a0: (-s ours) am b851cbc2: am 1a8697f9: Merge "Patch android-21 with aarch64 <sys/user.h> fixes." * commit '436f03a0800dee1f978d9da87f2696055df43204':