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


Trivial merge