OSDN Git Service

am 7cad688e: am 847fd031: Merge "Leave \'linux\' defined on x86/x86-64, like arm."
authorElliott Hughes <enh@google.com>
Thu, 24 Apr 2014 16:27:28 +0000 (16:27 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 24 Apr 2014 16:27:28 +0000 (16:27 +0000)
* commit '7cad688ea267df86ceb9c7fbfd6bc463af4580b1':
  Leave 'linux' defined on x86/x86-64, like arm.


Trivial merge