OSDN Git Service

Reconcile with jb-release nakasi-factoryrom-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 24 May 2012 16:01:36 +0000 (09:01 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 24 May 2012 16:01:36 +0000 (09:01 -0700)
Change-Id: I8413b3bf0524dbfee9b1d5201774e2e519e56cf8


Trivial merge