OSDN Git Service

Reconcile with jb-release nakasi-factoryrom-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 16 May 2012 15:31:49 +0000 (08:31 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 16 May 2012 15:31:49 +0000 (08:31 -0700)
Change-Id: I5a5b95da6c33afbc36893e162f3b57c09c161ee2


Trivial merge