Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 6 Jun 2013 17:37:30 +0000 (10:37 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 6 Jun 2013 17:37:30 +0000 (10:37 -0700)
Change-Id: Id19e45c1de96766e22fa6e721c864214ba233fd6


Trivial merge