merge in jb-release history after reset to master
The Android Automerger [Thu, 19 Apr 2012 14:05:11 +0000 (07:05 -0700)]

Trivial merge