OSDN Git Service

Reconcile with jb-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 20 Jun 2012 15:26:03 +0000 (08:26 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 20 Jun 2012 15:26:03 +0000 (08:26 -0700)
Change-Id: I38e3c46db8518d6c3d45afcf7b1d99421d95811d


Trivial merge