OSDN Git Service

resolved conflicts for merge of f7fb5331 to kraken
authorJean-Baptiste Queru <jbq@google.com>
Mon, 17 May 2010 20:50:32 +0000 (13:50 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Mon, 17 May 2010 20:50:32 +0000 (13:50 -0700)
commitde0076c7782b8feccf4d234e5b96700d6587218b
treea8ff93c42fb45597ef036e11858677c9666692e2
parent4edfe7501873df28554b675694b336579c078dfa
parent5a64b6daec2242f21060e3ea091d27ff17fbe4e8
resolved conflicts for merge of f7fb5331 to kraken

Change-Id: I61258dd7c7e52a6251c1d9499e113401ff375b20