| commit | 7cad688ea267df86ceb9c7fbfd6bc463af4580b1 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Apr 24 16:23:42 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 24 16:23:42 2014 +0000 |
| tree | b0b029a5ebfe9a7a5fa40ed807409228a6d3cfba | |
| parent | 62911d473e0798a626cdf8773eab0a7f6c461d1b [diff] | |
| parent | 847fd0311f6c82b8ac90d970cfc68aafd9913471 [diff] |
am 847fd031: Merge "Leave \'linux\' defined on x86/x86-64, like arm." * commit '847fd0311f6c82b8ac90d970cfc68aafd9913471': Leave 'linux' defined on x86/x86-64, like arm.