OSDN Git Service

resolved conflicts for merge of 9dfd7d0a to master
authorDianne Hackborn <hackbod@google.com>
Fri, 10 Jun 2011 01:39:37 +0000 (18:39 -0700)
committerDianne Hackborn <hackbod@google.com>
Fri, 10 Jun 2011 01:39:37 +0000 (18:39 -0700)
commit3ca5d8f6e02fe419d23aa8d181b9971110635d81
treea391a16652e856ed088baf870d69ccd2630df64f
parentc9af56c64b6553da70c20a2c61722be89024234b
parentf179fe39108b93fb93086cd779b2cca77493560a
resolved conflicts for merge of 9dfd7d0a to master

Change-Id: I9fbee3209b7fe5c7b5b42b62309eb60dc49bf9e2