OSDN Git Service

resolved conflicts for merge of 0287a8f6 to lmp-mr1-ub-dev
authorKonstantinos Menychtas <kmenychtas@google.com>
Tue, 25 Aug 2015 17:20:11 +0000 (10:20 -0700)
committerKonstantinos Menychtas <kmenychtas@google.com>
Tue, 25 Aug 2015 17:26:22 +0000 (17:26 +0000)
commite9a8f465859137ba37786031b804864205900cb4
tree264f1abd857d9149df8a618a22355a8001caa3c8
parent1dca55fde512f1758690fb563f1ffc9cec5f7271
parent0287a8f6c5915c4010c317cb3a589f66df762322
resolved conflicts for merge of 0287a8f6 to lmp-mr1-ub-dev

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