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:57 +0000 (18:43 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Sat, 19 May 2012 01:43:58 +0000 (18:43 -0700)
Change-Id: Ibfbde4f9437502df4a7580943f99ad13e427bdd5


Trivial merge