Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 3 Oct 2012 14:34:29 +0000 (07:34 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 3 Oct 2012 14:34:29 +0000 (07:34 -0700)
Change-Id: Ib5e744d8e5e05f06065f7650ac51590af9ad2a9e


Trivial merge