OSDN Git Service

Fix conflict resolving error in ef5dc90bba179f774bee0c7e479965cef12091de
authorYing Wang <wangying@google.com>
Fri, 26 Jun 2015 21:06:32 +0000 (14:06 -0700)
committerYing Wang <wangying@google.com>
Fri, 26 Jun 2015 21:06:32 +0000 (14:06 -0700)
commit78d1cba0f42d023483e64d5c7b6f9e1c8b236ed4
tree68e7346741f21aec518c124ec62290a0bb8fc1c4
parent1a4658cd3bf87ea4bf1abbe8dd87d944fc0e99d2
Fix conflict resolving error in ef5dc90bba179f774bee0c7e479965cef12091de

Change-Id: Ib561c8dec3bbd605007b46b8520f12d6e3e2db90
core/Makefile