OSDN Git Service

Merge "resolved conflicts for merge of a7f68230 to master"
authorRobert Greenwalt <rgreenwalt@google.com>
Tue, 26 Jul 2011 00:12:22 +0000 (17:12 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 26 Jul 2011 00:12:22 +0000 (17:12 -0700)
commit502c194ef00a0a19b75191f35ca3c9579f05d0f8
tree4bf0bbd4c63e36ac154f4d124d82218b2aedfe0a
parent66e3e1275f2c207ad58b3f42311b9520f7c645f5
parent8166de603707f09eef33d0c2019f816aa657e717
Merge "resolved conflicts for merge of a7f68230 to master"