OSDN Git Service

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


Trivial merge