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

Trivial merge