OSDN Git Service

resolved conflicts for merge of 2433c443 to honeycomb-plus-aosp
authorKenny Root <kroot@google.com>
Thu, 19 May 2011 19:48:14 +0000 (12:48 -0700)
committerKenny Root <kroot@google.com>
Thu, 19 May 2011 19:48:14 +0000 (12:48 -0700)
Change-Id: I3385f57e5761679e6700bcbe3c41deb3ecd43ba1


Trivial merge