OSDN Git Service

resolved conflicts for merge of f739e312 to master
authorAndreas Huber <andih@google.com>
Mon, 30 Aug 2010 22:36:58 +0000 (15:36 -0700)
committerAndreas Huber <andih@google.com>
Mon, 30 Aug 2010 22:36:58 +0000 (15:36 -0700)
commit36aa8c3798193a7f9eb8db3ab7d4c48c786ddf76
tree7eae9db3a5019f19e9d94cd84cd6b1a611f4f153
parentec9553f273b441c9a14c438e9bfb5e817f16715e
parentf739e3125e4724caed55939a3a00980b42c92326
resolved conflicts for merge of f739e312 to master

Change-Id: I3be6dbc299d2d761c96a6f00958d9a4c018ec290
CleanSpec.mk