OSDN Git Service

resolved conflicts for merge of 6ca56b6a to klp-modular-dev-plus-aosp
authorYing Wang <wangying@google.com>
Tue, 18 Feb 2014 19:17:53 +0000 (11:17 -0800)
committerYing Wang <wangying@google.com>
Tue, 18 Feb 2014 19:17:53 +0000 (11:17 -0800)
commit52cefc36cf4718cd85e6e35832b2a8674ba9e838
treedf0cdc9de12d1fb387e390043752446d6bf53dc3
parent0003192c32ff9672a3974709912acc853053c7a8
parent6ca56b6ae761edb79eed5e7df158204efa6dd26c
resolved conflicts for merge of 6ca56b6a to klp-modular-dev-plus-aosp

Change-Id: I8f647bb5ff9a4de1fbdbfb1dae169e547aeba3ce
core/main.mk