merge in jb-release history after reset to master
The Android Automerger [Mon, 5 Mar 2012 15:05:34 +0000 (07:05 -0800)]

Trivial merge