merge in jb-release history after reset to master

This commit is contained in:
The Android Automerger 2012-02-14 06:59:28 -08:00
commit f351ae488b

Diff Content Not Available