am 6ee42ec1: am 52db54cc: am bb21bfb0: am 7cad688e: am 847fd031: Merge "Leave \'linux\' defined on x86/x86-64, like arm."

* commit '6ee42ec18cd65b7332b380a8f153d614751f15b5':
This commit is contained in:
Elliott Hughes 2014-05-12 23:30:40 +00:00 committed by Android Git Automerger
commit b953a8115c

Diff content is not available