OSDN Git Service

Merge "resolved conflicts for merge of af75fdb1 to master"
authorRobert Greenwalt <rgreenwalt@google.com>
Wed, 27 Jul 2011 17:17:26 +0000 (10:17 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 27 Jul 2011 17:17:26 +0000 (10:17 -0700)
commit97bd1aef03027419f222e05b964571c298f1d378
tree94051a1a5dd6d8023a4f0455191b29f63067f9a1
parentbbe9cb4f5f87e36b886ea3ba72dc514a081f3fe3
parentc59c6da9ae14097c77eee69285c6eacc8130936c
Merge "resolved conflicts for merge of af75fdb1 to master"