OSDN Git Service

Reconcile with jb-release nakasi-factoryrom-release
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 19 May 2012 01:44:06 +0000 (18:44 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Sat, 19 May 2012 01:44:06 +0000 (18:44 -0700)
Change-Id: Ibc7ab1d501b3fd26d83a26a8daec7a01eb6f9030


Trivial merge