OSDN Git Service

resolved conflicts for merge of fab83a3d to jb-mr1-dev
authorJoe Onorato <joeo@google.com>
Fri, 17 Aug 2012 08:26:41 +0000 (01:26 -0700)
committerJoe Onorato <joeo@google.com>
Fri, 17 Aug 2012 08:26:41 +0000 (01:26 -0700)
commitc5fbef5413fea32b0084fd197bd27f9effcb2760
tree1bc6a17ba2653c4f1a331f22ce91b0e306ed6ad4
parent5956db9394a3d82bfe1b54bd0264624bd00095ee
parentfab83a3d62b8652ccdb5ddadc8a6a3f3bf0edf20
resolved conflicts for merge of fab83a3d to jb-mr1-dev

Change-Id: I97aff2be317fd10b68d933e65259ec48bd5ff6a1
core/main.mk