OSDN Git Service

resolved conflicts for merge of 77efd7b4 to master
authorIan Rogers <irogers@google.com>
Tue, 22 Apr 2014 17:03:16 +0000 (10:03 -0700)
committerIan Rogers <irogers@google.com>
Tue, 22 Apr 2014 17:03:16 +0000 (10:03 -0700)
commit2b96d6ae782188dadcb08523e44b8c94bd7626d3
treeccea0fc5351ed2e944c5bb623f51d84d7935f730
parent2290cbf811eae0703a462c158c2f25f08f7c2811
parent77efd7b4cdbcb9ffd12bc5289dc59ed95b544513
resolved conflicts for merge of 77efd7b4 to master

Change-Id: I2ff1be499d3c4a5c7da3b016c63a519edcda458f
target/board/generic_x86_64/device.mk