merge in jb-release history after reset to master
The Android Automerger [Wed, 7 Mar 2012 15:04:02 +0000 (07:04 -0800)]

Trivial merge