OSDN Git Service

resolved conflicts for merge of cbf26fd3 to master
authorNick Kralevich <nnk@google.com>
Fri, 14 May 2010 22:49:42 +0000 (15:49 -0700)
committerNick Kralevich <nnk@google.com>
Fri, 14 May 2010 22:49:42 +0000 (15:49 -0700)
commit15cb231c7df3a335ea10c1b20efa63cff637a11d
tree32eb490f5871d88f374817c750e869231f031a3a
parent995fc3866acd7ce9f70a02bb19dc57ec3314f614
parent744790dbb9c5423048774e16c84bf3402a08c76b
resolved conflicts for merge of cbf26fd3 to master

Change-Id: I1feb7266c1d5cdebbfb8b8fa0d87d986953a20b6