OSDN Git Service

resolved conflicts for merge of 8af7e8ed to master
authorNarayan Kamath <narayan@google.com>
Wed, 9 Apr 2014 11:33:03 +0000 (12:33 +0100)
committerNarayan Kamath <narayan@google.com>
Wed, 9 Apr 2014 11:33:03 +0000 (12:33 +0100)
commit110ea46e096b2aff0afb60224406fb76699308c7
tree3347ba9cd54e7a96861589a68bf4b74143951535
parent38568b424d3139c6d590f9b3d7961e16b8795dc2
parent8af7e8ed3ecdfdf06d251c37c0cedfe340ffe18a
resolved conflicts for merge of 8af7e8ed to master

Change-Id: Ib427b36e133e29d1c2e9cea065e4e63c1e2e2122
CleanSpec.mk
core/Makefile
core/config.mk
core/envsetup.mk