OSDN Git Service

resolved conflicts for merge of b6d53f0b to master
authorYing Wang <wangying@google.com>
Wed, 12 Feb 2014 22:58:06 +0000 (14:58 -0800)
committerYing Wang <wangying@google.com>
Wed, 12 Feb 2014 22:58:06 +0000 (14:58 -0800)
commite6a65a5f15695f4e601110979dc6861773c3444d
tree91e3a8691add5ef357e96d30113ed4b924664246
parent6336d6bf07f0c43f1675cbd99a887e572b4625e8
parentb6d53f0b31aa65641356e382c221f93b6d9c4fc3
resolved conflicts for merge of b6d53f0b to master

Change-Id: Id01809e2a72ca8ba13594621690273fc6f982095
core/main.mk
target/product/core_tiny.mk
target/product/generic_no_telephony.mk