OSDN Git Service

Reconcile with jb-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 25 Jun 2012 14:57:11 +0000 (07:57 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 25 Jun 2012 14:57:11 +0000 (07:57 -0700)
Change-Id: I80e21c4019904a7f755af426e3e29e41c9b23f78


Trivial merge