OSDN Git Service

resolved conflicts for merge of dd7dfafb to master
authorJean-Baptiste Queru <jbq@google.com>
Mon, 8 Feb 2010 17:08:58 +0000 (09:08 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Mon, 8 Feb 2010 17:08:58 +0000 (09:08 -0800)
commit81ff586177d4a954ec344fdba3cd895e3e34044c
treee2a0bbab09bab1bdb117d4112c0e2ca48dd234df
parentf5d8cb450f5077d2f9825ad658aeb20d44642968
parentdd7dfafbb10c13939cd99c920e18c0d8a5872031
resolved conflicts for merge of dd7dfafb to master

Change-Id: I0f27700877d9398a4fd09a8d6167fff03500018e