OSDN Git Service

Merge "resolved conflicts for merge of 06bb3aef to honeycomb-plus-aosp" into honeycom...
authorJeff Hamilton <jham@android.com>
Fri, 14 Jan 2011 06:58:08 +0000 (22:58 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 14 Jan 2011 06:58:08 +0000 (22:58 -0800)

Trivial merge