OSDN Git Service

resolved conflicts for merge of ca48433a to master
authorJean-Baptiste Queru <jbq@google.com>
Tue, 20 Jul 2010 17:40:17 +0000 (10:40 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Tue, 20 Jul 2010 17:40:17 +0000 (10:40 -0700)
commita267dd05fe909ecab0bbc1b1582f41d37d39fd79
tree06bbd40083a1bfe3694b0ba46f58f71878d9c2b4
parente2209d06ba33b5babddc6e2f2ba339edf3ce5c0b
parent61be2642e47097a1ceefd7b8128847dbda6819bf
resolved conflicts for merge of ca48433a to master

Change-Id: I0dd2dee65ff72b7eae20019c6232b66388fe7990