Update

Change-Id: I9ff4d739e75579782987ac5da946c04180cec0de
Merge branch 'cm-12.0' of git://github.com/wulsic/android_device_samsung_nevispcm11 into cm-12.0