OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Oct 2012 15:04:59 +0000 (08:04 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Oct 2012 15:04:59 +0000 (08:04 -0700)
Change-Id: Ie746268888d072f9a5bf32320bebc98afdc0ef8b


Trivial merge