OSDN Git Service

am feec98b1: resolved conflicts for merge of 62855a83 to jb-dev-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Thu, 17 May 2012 22:34:07 +0000 (15:34 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 May 2012 22:34:07 +0000 (15:34 -0700)
* commit 'feec98b139d2ca0b0164a5e178e75ce88b8f492f':
  Use i686-linux-android-4.6 for x86 build

1  2 
core/combo/TARGET_linux-x86.mk

Simple merge