Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 4 Oct 2012 14:48:44 +0000 (07:48 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 4 Oct 2012 14:48:44 +0000 (07:48 -0700)
Change-Id: Ia42f0b7dd97e46cfa521b1f57a3635a42464e1a9


Trivial merge