Cleanup of noob git mistakes

Change-Id: Ib0065c5e35eb85ce4045a7d0e0a4f91087f4972c
Merge branch 'cm-10.2' of github.com:zhalt/android_device_lge_mako into cm-10.2