OSDN Git Service

resolved conflicts for merge of 3f72af13 to master
authorDianne Hackborn <hackbod@google.com>
Fri, 10 Jun 2011 21:00:55 +0000 (14:00 -0700)
committerDianne Hackborn <hackbod@google.com>
Fri, 10 Jun 2011 21:00:55 +0000 (14:00 -0700)
commit8edd7f9a35276ca3e2c284e8b637fce3b7156b32
tree5ae6a26a039714ac07bd4627a4670c22a0d9edb3
parentaef9309b4ee4997e362889b94620f9446dc598b6
parent3f72af13706bc6715f692b8e4879dbb50f818881
resolved conflicts for merge of 3f72af13 to master

Change-Id: I675df80f6e4435e6fb275c8c1527fdc966c0322c
CleanSpec.mk
core/version_defaults.mk