OSDN Git Service

Reconcile with jb-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 22 May 2012 20:06:34 +0000 (13:06 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 22 May 2012 20:06:34 +0000 (13:06 -0700)
Change-Id: I37477f9871208d227b42937c5aa7d27129bdecb1


Trivial merge