OSDN Git Service

Merge "resolved conflicts for merge of 1a2344b8 to master"
authorJean-Baptiste Queru <jbq@google.com>
Thu, 18 Nov 2010 01:35:09 +0000 (17:35 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 18 Nov 2010 01:35:09 +0000 (17:35 -0800)
commitfea48b215175fe4e98ac21e8c7426c5f59df76a4
treeed68a85d29dc6c8b8f72b947b778186e6f871579
parent28462eb7a6cba60f933fca65975e13c510859ab3
parentbda00faca828fd9e537972de059ba0e96e7eff56
Merge "resolved conflicts for merge of 1a2344b8 to master"