OSDN Git Service

resolved conflicts for merge of 162991be to gingerbread-plus-aosp
authorYing Wang <wangying@google.com>
Wed, 7 Sep 2011 18:20:28 +0000 (11:20 -0700)
committerYing Wang <wangying@google.com>
Wed, 7 Sep 2011 18:20:28 +0000 (11:20 -0700)
commitba35b2d61531a071533891307904e6ad7f81fb65
treec998ede3f44474e7aec82d5483d73e97ab242679
parent08b8e0024812ea907cf3938bcd07b8dca6188eaf
parent162991beb523ad1b88507c3855423866c856b107
resolved conflicts for merge of 162991be to gingerbread-plus-aosp

Change-Id: I06edde6c517b4c4e2bd03e2d1d44da52ee3066d5
core/base_rules.mk