OSDN Git Service

Reconcile with jb-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 20 Jun 2012 15:26:04 +0000 (08:26 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 20 Jun 2012 15:26:04 +0000 (08:26 -0700)
Change-Id: I84c9b6e4663448275a78cab4ea14f4952b440c8f


Trivial merge