OSDN Git Service

resolved conflicts for merge of 76450622 to master
authorDianne Hackborn <hackbod@google.com>
Thu, 2 Jun 2011 16:20:52 +0000 (09:20 -0700)
committerDianne Hackborn <hackbod@google.com>
Thu, 2 Jun 2011 16:20:52 +0000 (09:20 -0700)
commite418eaa8e75bd6379b08610512f151edfc4052cb
treed22b6e74ceca0cc372ef3956198779d7b63c9b46
parentac47e958aeca1c500a4ea09a440994e55dacaeef
parent81b95108a84dbcb5e953e912820fd45736d70519
resolved conflicts for merge of 76450622 to master

Change-Id: I26ccd8f264e65f100d894f43cf597a781552db83