OSDN Git Service

resolved conflicts for merge of 590ec479 to master
authorDianne Hackborn <hackbod@google.com>
Wed, 1 Jun 2011 01:26:45 +0000 (18:26 -0700)
committerDianne Hackborn <hackbod@google.com>
Wed, 1 Jun 2011 06:11:16 +0000 (23:11 -0700)
commit02027de4e1c8a7c4ad045d470c154bb290061525
treec97b8969e4ef613eb50132c6fb67db73972f0892
parent1010ae4f61f23dd9869c285932cf22b13bf7b1a9
parent74ab5dd5c3b9b6b32d6763b0f0f57a3e881145f0
resolved conflicts for merge of 590ec479 to master

Change-Id: I30503da6a73b9cb15eee66a67c75d50ccdc4b9f0