OSDN Git Service

resolved conflicts for merge of db0d59d1 to honeycomb-plus-aosp
authorRaphael <raphael@google.com>
Fri, 25 Mar 2011 22:13:55 +0000 (15:13 -0700)
committerRaphael <raphael@google.com>
Fri, 25 Mar 2011 22:13:55 +0000 (15:13 -0700)
commit9b4660a1c6edae915c39261bc3d1a3f3696075c4
treea3fd45402544fdc43584175b26f5281d3fe65dd0
parent27c782bfcdbec689fc7d195fe485e6f2c623e7cf
parentdb0d59d1b4a02816832d330c0bfa86ee67f2776e
resolved conflicts for merge of db0d59d1 to honeycomb-plus-aosp

Change-Id: Ie3f5b2986bc926407a7883b449441cb58ab70e30
core/Makefile
core/combo/TARGET_linux-x86.mk
core/tasks/sdk-addon.mk
target/product/full_x86.mk