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)
commit86dc75dcb45880832dc125d2f38dce4ca63a1e78
treedcc880e948f2a442ec8c0b08406e904c913c98a3
parentb10d106f6e991177020c318ffb9d0fb0cca3eddc
parent27b308beb65aac8d235673f2a6c33ae13d9041b1
parent363cef472e275f4900dc4916acd03718c7d57284
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

Change-Id: Id19e45c1de96766e22fa6e721c864214ba233fd6