OSDN Git Service

Merge "resolved conflicts for merge of ec85619f to master"
authorDianne Hackborn <hackbod@google.com>
Fri, 13 May 2011 19:06:45 +0000 (12:06 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 13 May 2011 19:06:45 +0000 (12:06 -0700)
commit01981499211db84d289161dec5f54c44cd170e18
treecdd43bdaa29836314b9636a3e5c2c4354c8b4858
parent721e042a6b7083ad9a87be8a5345f287d9fc66f4
parent9b1fa3477e5fdc54bf146f265b69b836796d4ce7
Merge "resolved conflicts for merge of ec85619f to master"