OSDN Git Service

Reconcile with jb-release nakasi-factoryrom-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 29 May 2012 16:39:20 +0000 (09:39 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 29 May 2012 16:39:20 +0000 (09:39 -0700)
Change-Id: I804144e79bf82b1d6d1f9e6dc9073249aad597f0


Trivial merge