OSDN Git Service

Reconcile with jb-release nakasi-factoryrom-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 30 May 2012 17:12:45 +0000 (10:12 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 30 May 2012 17:12:45 +0000 (10:12 -0700)
Change-Id: Iaa4109b5db2d6b15e214c05554b586e5604d9692


Trivial merge