merge in jb-release history after reset to jb-dev
The Android Automerger [Fri, 8 Jun 2012 15:22:49 +0000 (08:22 -0700)]

Trivial merge