merge in jb-release history after reset to jb-dev
The Android Automerger [Wed, 25 Apr 2012 14:49:08 +0000 (07:49 -0700)]

Trivial merge