OSDN Git Service

resolved conflicts for merge of ef1335ed to jb-dev-plus-aosp
authorGuang Zhu <guangzhu@google.com>
Thu, 12 Jul 2012 02:36:17 +0000 (19:36 -0700)
committerGuang Zhu <guangzhu@google.com>
Thu, 12 Jul 2012 02:36:17 +0000 (19:36 -0700)
commit96d9fa29cd1ff48b733eb090e99fe165d194d313
tree8a1933a06a125b9c2bbf8aa988ba81fb611c0114
parentc16c945497852629294f9207d317886f8af3a375
parentef1335eda485cc4d6a7172e08dc89212fb27ed6b
resolved conflicts for merge of ef1335ed to jb-dev-plus-aosp

Change-Id: I4da6c32635e67730ac595a2a04165f12c37c1c15
target/board/generic/BoardConfig.mk
target/board/generic_x86/BoardConfig.mk