OSDN Git Service

resolved conflicts for merge of cbf26fd3 to master
authorNick Kralevich <nnk@google.com>
Fri, 14 May 2010 22:49:42 +0000 (15:49 -0700)
committerNick Kralevich <nnk@google.com>
Fri, 14 May 2010 22:49:42 +0000 (15:49 -0700)
commit963b0cdbaf206050fb537c21641c0ee26a48611e
tree60260bc8d86a9dd32b09c341d6b99622610d32b7
parentaa8da3dc405dca80c6aff71a7c17f883edea2814
parentcbf26fd3bc2dc0d6377daf65b498ca11b96e601c
resolved conflicts for merge of cbf26fd3 to master

Change-Id: I1feb7266c1d5cdebbfb8b8fa0d87d986953a20b6