OSDN Git Service

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


Trivial merge