update
Merge branch 'jb-mr1' of github.com:erikcas/android_device_samsung_gio into jb-mr1