| commit | f65d552b3de50fd9124f9704eda3e04d02c25a32 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Sat Jul 12 02:06:38 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jul 12 02:06:38 2014 +0000 |
| tree | 5936be8505fc8b9fe71dce884b4800963486c07b | |
| parent | 8832cfb2fea643ccf0378e2864ba25d773cad408 [diff] | |
| parent | 0594b9ddded7d832b786c209dd7cd4e26ee32eb8 [diff] |
am 0594b9dd: am b8e82b5e: Merge "EM_ARM and EM_AARCH64 are now in the uapi header." * commit '0594b9ddded7d832b786c209dd7cd4e26ee32eb8': EM_ARM and EM_AARCH64 are now in the uapi header.