OSDN Git Service

resolve conflicts w/aaf823d2
authorEd Heyl <edheyl@google.com>
Mon, 8 Dec 2014 18:53:50 +0000 (10:53 -0800)
committerEd Heyl <edheyl@google.com>
Mon, 8 Dec 2014 18:53:50 +0000 (10:53 -0800)
commit898b9e43cfc275acf727b748c191877349a78d98
tree1375c1995f453964ca3f020f81a1235b8324a7dc
parent69b8c4f9314e6c48dde64a234b2f4b25500abb36
parentaaf823d23c9d3fa1d6b1fd513d07f6fd14f6ea2c
resolve conflicts w/aaf823d2

Change-Id: I7c5cf1d1e074a67bdd19a7cf51f45e5f3e026c84
CleanSpec.mk