OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 6 Aug 2012 20:25:19 +0000 (13:25 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 6 Aug 2012 20:25:19 +0000 (13:25 -0700)
Change-Id: I777141c45361238f717e457d3af3f75e268c1fcc


Trivial merge