OSDN Git Service

am 6e207824: resolved conflicts for merge of 572d0d7d to jb-dev-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Wed, 13 Jun 2012 14:44:31 +0000 (07:44 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 13 Jun 2012 14:44:31 +0000 (07:44 -0700)
commit41a3fb37079e09365a91aa00557914b323c87e54
treef77fcfc0ecd4f847b466d2b4c999c71b27892d39
parent2f65e81974f733648b5eff4983d34a09d51f66c8
parent6e207824af267eea8777949ccf6d0584accd55a0
am 6e207824: resolved conflicts for merge of 572d0d7d to jb-dev-plus-aosp

* commit '6e207824af267eea8777949ccf6d0584accd55a0':
  x86: Clean up atom vs/ non-atom compiler flags, enable SSSE3
core/combo/TARGET_linux-x86.mk