Reconcile with jb-mr2-release - do not merge
The Android Open Source Project [Thu, 6 Jun 2013 17:37:39 +0000 (10:37 -0700)]
Change-Id: I8fe42e68f532332b358b4debfae78721eccee49f


Trivial merge