merge in jb-release history after reset to jb-dev
The Android Automerger [Fri, 4 May 2012 23:16:26 +0000 (16:16 -0700)]

Trivial merge