OSDN Git Service

resolved conflicts for merge of 747a9780 to honeycomb-plus-aosp
authorKenny Root <kroot@google.com>
Tue, 22 Feb 2011 19:13:23 +0000 (11:13 -0800)
committerKenny Root <kroot@google.com>
Tue, 22 Feb 2011 19:13:23 +0000 (11:13 -0800)
commit1b8798894c90ef5deaf4f49d468e959ea3c19131
tree27dded29c88067d89cd543fa7d95246d93d587fe
parenta3c3bc336600bb30680adb920e0b17b28e250dc0
parent747a9780a8e6bfae5a69540e017a50aaac9c6758
resolved conflicts for merge of 747a9780 to honeycomb-plus-aosp

Change-Id: I06b2fba1d14343bf0489447a01bb7d0bdb675307
core/base_rules.mk
core/clear_vars.mk
core/combo/TARGET_linux-arm.mk
core/combo/TARGET_linux-sh.mk
core/definitions.mk