OSDN Git Service

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


Trivial merge