OSDN Git Service

Merge "merge from honeycomb mr2"
authorRussell Brenner <russellbrenner@google.com>
Thu, 26 May 2011 22:59:02 +0000 (15:59 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 26 May 2011 22:59:02 +0000 (15:59 -0700)

Trivial merge