OSDN Git Service

resolved conflicts for merge of 3e91f5ad to jb-mr1-dev
authorAndrew Hsieh <andrewhsieh@google.com>
Wed, 12 Sep 2012 22:27:59 +0000 (15:27 -0700)
committerAndrew Hsieh <andrewhsieh@google.com>
Wed, 12 Sep 2012 22:27:59 +0000 (15:27 -0700)
commit5630521aba12a03637e7328686924df4d298ff4d
treee98a11812008c753ac2e01e84f3301967532d221
parent063d0c5deefc1cda1027a9241dbaf338cac35be0
parent3e91f5ad763983af56f54d794045f451265f8d91
resolved conflicts for merge of 3e91f5ad to jb-mr1-dev

Change-Id: I9b587bc6086e1edacc98879e43668001bf72f7db
core/combo/TARGET_linux-x86.mk