OSDN Git Service

Merge "resolved conflicts for merge of ec348b49 to honeycomb-plus-aosp" into honeycom...
authorIrfan Sheriff <isheriff@google.com>
Thu, 3 Feb 2011 00:03:29 +0000 (16:03 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 3 Feb 2011 00:03:29 +0000 (16:03 -0800)

Trivial merge