OSDN Git Service

Reconcile with honeycomb-mr2-release honeycomb-LTE-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 10 Jun 2011 21:23:34 +0000 (14:23 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 10 Jun 2011 21:23:34 +0000 (14:23 -0700)
Change-Id: I3a2411dbab421bbf1d007c73ec729b4ca58dba48


Trivial merge