OSDN Git Service

resolved conflicts for merge of e2aa0490 to master
authorDianne Hackborn <hackbod@google.com>
Fri, 10 Jun 2011 00:50:36 +0000 (17:50 -0700)
committerDianne Hackborn <hackbod@google.com>
Fri, 10 Jun 2011 00:50:36 +0000 (17:50 -0700)
commit5ea8834ab90edad020ae9aa94753eec1901eca51
treea391a16652e856ed088baf870d69ccd2630df64f
parent1844b17bbcf58766857a93e5c8ad8f20eb28205b
parentb0cc4a8083d81f00f808edf75cde336741fdd170
resolved conflicts for merge of e2aa0490 to master

Change-Id: Id0448a1598fc93aca0652b29253e02586e35a067