print CM_VERSION in build config

Change-Id: Iead654e30798a11e636ec743683f3431d14a858c
build: register BOARD_HAVE_BLUETOOTH_BLUEZ

Change-Id: I53a3865bd3c6b69093934b02b9a1dfc1a7cb8304
Improve mergeupstream

- upstream: .config file can contain multiple github instances, fetch androidarmv6
- mergeupstream: Don't show repo sync & abandon messages

Change-Id: I222c94de1cd0efe2edc13ef7ed61eb217fbab7e4
Merge remote branch 'cm/cm-10.1'
Add emulator modules to PRODUCT_PACKAGES in full and sdk products

Bug: 7556265
Change-Id: Ie84f5ed6b17cccea7e6181f16686e2aac6955f1a
Add module names to emulator PRODUCT_PACKAGES.

Instead of using "LOCAL_MODULE_TAGS := debug" to install them.

Bug: 8276818
Change-Id: I7eba3c4e6c2f07ebe661522cb0e14afcc3ef7e92
bacon: name the package correctly

The variable CM_VERSION gets updated each build, but
the actual ro.cm.version in the build.prop doesn't on
incremental builds.

Name the 'bacon' package according to cm version
from the build.prop (if it exists), so that the actual
version and the name of the zip stay in sync.

Change-Id: I2dacfbbf2ae418945a9b37fef2fd7cbd31510e26
Merge remote branch 'cm/cm-10.1'
envsetup: allow using mka for mm{,m}

Change-Id: I6c0fce5e67a3b5c49023d3c00825e35b08d41845
Revert "Allow disabling DroidDoc build."

This reverts commit 875e83165081425e74ce7c999b51c01cac0c876c

Change-Id: I670a1bea555cc7ac8346fba347b9cb40092c3da1
Merge remote branch 'cm/cm-10.1'
eat: Eat using adb sideload

 * Requires new recovery and updated adbd

Change-Id: I65990822ab63313701d74783d95611d128d90f94
Merge remote branch 'cm/cm-10.1'
update

Change-Id: I1a1d37a9a5e74507f3c35c77b1fc2c0cb5bd6948
Merge github.com:androidarmv6/android_build into tc10.1

Conflicts:
	core/Makefile

Change-Id: Iae6f6407cb671e6466518aaff96bf586b4ad0f0c