OSDN Git Service

merge from open-source master
authorJean-Baptiste Queru <jbq@google.com>
Tue, 1 Sep 2009 18:46:14 +0000 (11:46 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Tue, 1 Sep 2009 18:46:14 +0000 (11:46 -0700)
commit3f155e96868a1b1d505cceacbdb71bb74665c304
treef47c585c457a7fed85f6a9d83c8d2b5de35ee9f1
parentc5ff11ecd5bb38b249e5d8850d80cd5b7f793a50
parent3087e324291c1aecb74b008e1af58869e11b7eb6
merge from open-source master