Derp

Change-Id: I31d2e4e1497f85be04520f5976a1d5d326bcb006
Merge branch 'cm-10.1' of github.com:vixin/android_manifest into default