Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 2 Oct 2012 16:19:05 +0000 (09:19 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 2 Oct 2012 16:19:05 +0000 (09:19 -0700)
Change-Id: I0d505138d8787065c448c5d3d5523a21329c6e90


Trivial merge