OSDN Git Service

Merge "resolved conflicts for merge of e2aa0490 to master"
authorDianne Hackborn <hackbod@google.com>
Fri, 10 Jun 2011 01:00:12 +0000 (18:00 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 10 Jun 2011 01:00:13 +0000 (18:00 -0700)
commitcbbd63fafb448d4bd21c20dd64372a28f5354459
treea391a16652e856ed088baf870d69ccd2630df64f
parenta4e05c3c2aade75630239c40be48e2b9123e53c9
parent5ea8834ab90edad020ae9aa94753eec1901eca51
Merge "resolved conflicts for merge of e2aa0490 to master"