merge in jb-release history after reset to master

This commit is contained in:
The Android Automerger 2012-02-29 07:04:33 -08:00
commit 6faf5cff59

Diff content is not available