OSDN Git Service

Merge "resolved conflicts for merge of a4fb8c86 to honeycomb-plus-aosp" into honeycom...
authorEd Heyl <edheyl@google.com>
Fri, 4 Mar 2011 23:07:23 +0000 (15:07 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 4 Mar 2011 23:07:23 +0000 (15:07 -0800)

Trivial merge