1. bb4c0cb Fix merge conflicts and update for 4.4 kitkat by Dees Troy ยท 11 years ago