OSDN Git Service

Reconcile with honeycomb-mr2-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 15 Jun 2011 22:10:01 +0000 (15:10 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 15 Jun 2011 22:10:01 +0000 (15:10 -0700)
Change-Id: If4754920ba3d9c25730d0d939235ea779a510369


Trivial merge