OSDN Git Service

resolved conflicts for merge of db81dc72 to master
authorAdam Powell <adamp@google.com>
Thu, 8 Dec 2011 02:18:58 +0000 (18:18 -0800)
committerAdam Powell <adamp@google.com>
Thu, 8 Dec 2011 02:18:58 +0000 (18:18 -0800)
commitc12ba312a4daa11360a2ad40bcc10dfc4af46db2
treebb3e26939a6b6a0c0b0b5ab4b12fe4f0dc5d7bf3
parentc41d2c4460b390a0804bc67143c877ab6709bb2f
parent022d04f12bb9a004c224df90e7d6759cc79f64b3
resolved conflicts for merge of db81dc72 to master

Change-Id: Ie7e1d9a255934e45d8b241b15e9674046cff2444