Reconcile with jb-release
The Android Open Source Project [Thu, 24 May 2012 16:01:52 +0000 (09:01 -0700)]
Change-Id: I5082e21795dab58054b3a6fea228ac6e0312be15


Trivial merge