Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 27 Sep 2012 16:58:25 +0000 (09:58 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 27 Sep 2012 16:58:25 +0000 (09:58 -0700)
Change-Id: I033900565b24e63e166a836229ffd021e3b4e682


Trivial merge