OSDN Git Service

Merge "resolved conflicts for merge of f0b7977f to honeycomb-plus-aosp" into honeycom...
authorJeff Hamilton <jham@android.com>
Wed, 26 Jan 2011 00:29:48 +0000 (16:29 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 26 Jan 2011 00:29:48 +0000 (16:29 -0800)

Trivial merge