OSDN Git Service

Merge "resolved conflicts for merge of 77ba255e to honeycomb-plus-aosp" into honeycom...
authorScott Main <smain@google.com>
Thu, 27 Jan 2011 02:48:22 +0000 (18:48 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 27 Jan 2011 02:48:22 +0000 (18:48 -0800)

Trivial merge