OSDN Git Service

resolved conflicts for merge of 966611a9 to master-nova
authorBrian Carlstrom <bdc@google.com>
Fri, 21 Feb 2014 18:29:55 +0000 (10:29 -0800)
committerBrian Carlstrom <bdc@google.com>
Fri, 21 Feb 2014 18:29:55 +0000 (10:29 -0800)
Change-Id: Iefe66d7b0bc604460ab18228233ec61c98490b8a

1  2 
CleanSpec.mk

diff --cc CleanSpec.mk
Simple merge