RepoPick: Actually skip merged commit instead of exiting

PS2: add missing semicolon

Change-Id: Ib67f2444878bcde23acc0300782b68c791989286
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
qcom_utils: Update list of QCOM_BOARD_PLATFORMS

Add msm8226 (Moto G) and other upcoming platforms
Change-Id: Icf895cbcf86791ca800636a1c0893b3a905a27a0
build: Fix cflags for QC targets

Change-Id: I2281bec3afb4d80e80845718d880dc24ef7baf32
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
envsetup: repolastsync prints date/time of last repo sync

Change-Id: I4280b500e58237479194ad2e230ed7466db87755
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Allow individual projects to enforce a property's value

Some projects require system properties to be set to a specific
value (for example, a shared library needing a property pointing
to its own path) in order to work correctly, but some device
configurations are mistakenly setting those properties with the
wrong value (usually inherited from the original OEM build).

"PRODUCT_PROPERTY_UBER_OVERRIDES += property=value" can (and
should) be used in that project's makefile to ensure the value
is the correct one. This variable is intended for software projects,
and should never be used in product makefiles (BoardConfig, cm.mk,
AndroidProduct)

Change-Id: I1986e7c444e51cce8b198e43fdc793fad16d6276
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Allow individual projects to enforce a property's value

Some projects require system properties to be set to a specific
value (for example, a shared library needing a property pointing
to its own path) in order to work correctly, but some device
configurations are mistakenly setting those properties with the
wrong value (usually inherited from the original OEM build).

"PRODUCT_PROPERTY_UBER_OVERRIDES += property=value" can (and
should) be used in that project's makefile to ensure the value
is the correct one. This variable is intended for software projects,
and should never be used in product makefiles (BoardConfig, cm.mk,
AndroidProduct)

Change-Id: I1986e7c444e51cce8b198e43fdc793fad16d6276
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0

Conflicts:
	tools/post_process_props.py

Change-Id: I94e53acb745f90116288f57e431903f73fcb73b9
Merge "RepoPick: Actually skip merged commit instead of exiting" into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
BoardConfig.mk.template: Add TARGET_CPU_VARIANT

Change-Id: I8cd74a794e0d1a6818b5479cf7f5264e87d565f3
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Merge remote-tracking branch 'hydra/cm-11.0' into cm-11.0