merge in jb-release history after reset to jb-dev
The Android Automerger authored
fc7276f9