RepoPick: Actually skip merged commit instead of exiting

PS2: add missing semicolon

Change-Id: Ib67f2444878bcde23acc0300782b68c791989286
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
build: tools: device: fix the failing recovery builds when using mkvendor.sh

4.3 requires the cpu variant to be set. set it to generic to fix the build

Change-Id: Iab8ce2776ca887330bb0fe1366826ef306dd848c
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
build: add support for Asturian

Change-Id: I43ea9062756a97b0f9cba7bee042dbfcd18b51b5
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2

Conflicts:
	target/product/languages_full.mk
	target/product/locales_full.mk