OSDN Git Service

resolved conflicts for merge of ef44fb2d to lmp-dev-plus-aosp
authorYing Wang <wangying@google.com>
Thu, 17 Jul 2014 21:51:13 +0000 (14:51 -0700)
committerYing Wang <wangying@google.com>
Thu, 17 Jul 2014 21:51:13 +0000 (14:51 -0700)
commit06940df71383b5acfdfdf9d4d4cf6e30090dfa7c
tree3dec4976a79dc86d925302f642bccc0a572dfe8d
parentf551abc4fcffb7d6aad112deb3c21fe4fa602925
parentef44fb2d7b6f417a0391a5b6ce2993c234885633
resolved conflicts for merge of ef44fb2d to lmp-dev-plus-aosp

Change-Id: I5551e6b1303f2b37d199a1b894f37c50839fdecc
core/main.mk
target/product/embedded.mk