Merge commit '50738779' into gingerbread-plus-aosp

Conflicts:
	core/version_defaults.mk

Change-Id: I69ae9d5b3e0532c67c401a8320e69aab5ee66b0f

diff --cc core/version_defaults.mk
index 22c15ca,27e1ec4..d4a429d
--- 1/core/version_defaults.mk
--- 2/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@@ -96,4 -96,4 +96,3 @@@ ifeq "" "$(BUILD_NUMBER)
    # anyone trying to parse it as an integer will probably get "0".
    BUILD_NUMBER := eng.$(USER).$(shell date +%Y%m%d.%H%M%S)
  endif
--