OSDN Git Service

Merge "resolved conflicts for merge of ed1a9c77 to master"
authorDianne Hackborn <hackbod@google.com>
Sat, 11 Jun 2011 02:24:49 +0000 (19:24 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 11 Jun 2011 02:24:49 +0000 (19:24 -0700)
commitf497b679405bfefed7648c5ce1098d646057c01d
tree862c72cb956abeb756b2d3c23455935cc5616b19
parentc31d5be0c6a56914d63e5f21e8c51a5604fadfc0
parent24da0e5f3a6188087122db7569165dc59ad9228d
Merge "resolved conflicts for merge of ed1a9c77 to master"