OSDN Git Service

Merge "resolved conflicts for merge of 590ec479 to master"
authorDianne Hackborn <hackbod@google.com>
Wed, 1 Jun 2011 06:34:46 +0000 (23:34 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 1 Jun 2011 06:34:46 +0000 (23:34 -0700)
commit855e7ba0cfa9a62b40134e7f8813c400d18b107a
treec97b8969e4ef613eb50132c6fb67db73972f0892
parent03d9b10224947b51f806371938e9f1421126198f
parent02027de4e1c8a7c4ad045d470c154bb290061525
Merge "resolved conflicts for merge of 590ec479 to master"