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)
commit902e09d43a6c6f9db6b4db4145fdea8b757be05f
treed5717d15ade7cf50b193931ee32d3ce0e6be54be
parentff8048bc48a8d7987a7bc1e37f49089fa9104b60
parent966611a9c2acae7d497d670ece8c6dcd54e07abb
resolved conflicts for merge of 966611a9 to master-nova

Change-Id: Iefe66d7b0bc604460ab18228233ec61c98490b8a
CleanSpec.mk