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