OSDN Git Service

resolved conflicts for merge of 6835cbf9 to master
authorNarayan Kamath <narayan@google.com>
Fri, 6 Dec 2013 17:31:38 +0000 (17:31 +0000)
committerNarayan Kamath <narayan@google.com>
Fri, 6 Dec 2013 17:31:38 +0000 (17:31 +0000)
commit1d755aaa7b40254d4ebb40d5b970e8f17a0de0c0
tree19af6c04823f88a3f40fb2d6965b86d8184800ec
parent5e398801fd400cf21f2fab425975817e2f1c32f1
parent6835cbf9327336180f440a16bc8c8c909f8a2d07
resolved conflicts for merge of 6835cbf9 to master

Change-Id: I21593edf5f597bc79ff91b756bdaf6921b05cba7
core/main.mk