update
Merge branch 'jellybean' of https://github.com/rookiepeng/proprietary_vendor into jellybean