OSDN Git Service

Merge "resolved conflicts for merge of 8c2d872a to honeycomb-plus-aosp" into honeycom...
authorRaphael <raphael@google.com>
Tue, 29 Mar 2011 20:07:51 +0000 (13:07 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 29 Mar 2011 20:07:51 +0000 (13:07 -0700)

Trivial merge