merge in jb-release history after reset to master
The Android Automerger [Mon, 23 Apr 2012 14:06:15 +0000 (07:06 -0700)]

Trivial merge