derp
Merge branch 'patch-2' of https://github.com/franco-c/frameworks_base_xy into jellybean