OSDN Git Service

resolved conflicts for merge of 8550f3b8 to master
authorRobert Greenwalt <rgreenwalt@google.com>
Fri, 15 Jul 2011 17:52:54 +0000 (10:52 -0700)
committerRobert Greenwalt <rgreenwalt@google.com>
Fri, 15 Jul 2011 17:52:54 +0000 (10:52 -0700)
commitdb36dafd72b30633882eff994f8b6c64ce340814
treeab847cb2abefdd74a208e7bab5a976a7ef5e9362
parenta94090a78392b9b62bc778ec706ff629a26e9bde
parentb4bd2daedd7beb5dbe91c4a34cb5b6bf794d8def
resolved conflicts for merge of 8550f3b8 to master

Change-Id: If2881b8b7faea5139af83a37cba04ccac5904f81