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)
commitf06d6d7361465ba2174bea88b3562afac9b94eb9
tree4f3c86bc1700f1669ce778ad174abae7c5b2198a
parente65f77a2ce4033b57cfefc3fee61bd07dc06e458
parentdcf2c47b713980031efa6436e4dc96f54896f341
Reconcile with jb-mr1-release - do not merge

Change-Id: I033900565b24e63e166a836229ffd021e3b4e682