OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 6 Sep 2012 14:52:45 +0000 (07:52 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 6 Sep 2012 14:52:45 +0000 (07:52 -0700)
Change-Id: Ib48e7e0203914e134df9fcd864553e12b2ccc93e


Trivial merge