Reconcile with jb-mr2-release - do not merge
The Android Open Source Project [Mon, 20 May 2013 15:20:30 +0000 (08:20 -0700)]
Change-Id: If271caed3f7608a76ca5a6307306838fb2cdc829


Trivial merge