OSDN Git Service

resolved conflicts for merge of ad495272 to master
authorYing Wang <wangying@google.com>
Thu, 20 Mar 2014 22:24:52 +0000 (15:24 -0700)
committerYing Wang <wangying@google.com>
Thu, 20 Mar 2014 22:24:52 +0000 (15:24 -0700)
commit636dc20d1a2ddb44b345be5ad6e04024788ad90b
tree79dd7dc97ae40c4c71590cef0824803c01d7e168
parent994014964fc2e51c1388de707be2204558ca22cc
parentad49527265bff39251bafb3aed9dcb3412f5a6d4
resolved conflicts for merge of ad495272 to master

Change-Id: I6b47768f44b1a6136ca31936e19f943ee72cb627
core/config.mk
target/product/base.mk