OSDN Git Service

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


Trivial merge