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:06 +0000 (08:41 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 16 May 2012 15:41:06 +0000 (08:41 -0700)
Change-Id: Id053dd82525fdf0244797e5c641aca8d122d8b4b


Trivial merge