OSDN Git Service

resolved conflicts for merge of 610520ad to mnc-dev-plus-aosp
authorTao Bao <tbao@google.com>
Thu, 6 Aug 2015 17:57:57 +0000 (10:57 -0700)
committerTao Bao <tbao@google.com>
Thu, 6 Aug 2015 17:57:57 +0000 (10:57 -0700)
commit91fdd1a3219ba514a127d553878b582bc13e903f
treed916be566863fc03a63cd049093af05759032b9b
parent4a368585a5f8ae44146c222f6e4b6050e583939e
parent610520ad206fcb886c6c09f763f434caac8531ff
resolved conflicts for merge of 610520ad to mnc-dev-plus-aosp

Change-Id: I55ad47c70091d4f42f83783e9876846f19e2a777
core/Makefile