OSDN Git Service

resolved conflicts for merge of de949b11 to jb-mr2-dev
authorYing Wang <wangying@google.com>
Fri, 8 Mar 2013 01:58:32 +0000 (17:58 -0800)
committerYing Wang <wangying@google.com>
Fri, 8 Mar 2013 02:00:03 +0000 (18:00 -0800)
commit4781e30a96f5b0251b8c090351ff8aa20aeddf0d
treeca42f574512d50844f62e55126ab2ccd229d8c33
parentc08eceee8e09a5bd4414d307792712adae741e4e
parentde949b11afb58a343178a7eac9c2ca0860f7405f
resolved conflicts for merge of de949b11 to jb-mr2-dev

Change-Id: I5a4c8cefeaf9e2f27be4b7ed8e4b30cb5a83a2f5
target/product/emulator.mk