Fixes

Signed-off-by: Paul Keith <javelinanddart@gmail.com>
Fixes

Signed-off-by: Paul Keith <javelinanddart@gmail.com>
Merge branch 'lollipop' of github.com:javelinanddart/android_kernel_aosp_ville into lollipop