S5 edify_defs
Merge branch 'master' of https://github.com/mrimp/Android-Kitchen
Merge pull request #2 from mrimp/master

S5 edify_defs