OSDN Git Service

Merge "resolved conflicts for merge of 242fa52b to master"
authorGilles Debunne <debunne@google.com>
Mon, 4 Oct 2010 23:01:22 +0000 (16:01 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 4 Oct 2010 23:01:22 +0000 (16:01 -0700)
commitb6b193013d4641cbbf0170c98aebc5c3f6a2214b
treeeab55d5c70f026a74de0ce36362e9efe03c02a3d
parente799720dd478c60ac027d296f329b469119d1c1c
parent3dd101133a4cf0247ee9f2665abc360a134d0665
Merge "resolved conflicts for merge of 242fa52b to master"