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)
Change-Id: I0f27700877d9398a4fd09a8d6167fff03500018e


Trivial merge