merge in jb-release history after reset to master
The Android Automerger [Tue, 31 Jan 2012 15:02:40 +0000 (07:02 -0800)]

Trivial merge