OSDN Git Service

resolved conflicts for merge of af75fdb1 to master
authorRobert Greenwalt <rgreenwalt@google.com>
Wed, 27 Jul 2011 17:00:36 +0000 (10:00 -0700)
committerRobert Greenwalt <rgreenwalt@google.com>
Wed, 27 Jul 2011 17:00:36 +0000 (10:00 -0700)
commit682ee1c371753b5d9bc06d2e2f3a5827a277fdb6
tree945c8c177235a70889660e6334a7f010f6926fb4
parent14bf390692a22cdc3691249c263bb580880f9e42
parent5bf7250ab79b961a412ebbd671c976784f0208a1
resolved conflicts for merge of af75fdb1 to master

Change-Id: Ib7f3521b0af6df9346cf940d69f2988b1c87e129