resolve merge conflicts of 0d00d287 to nyc-dev

LOCAL_ADDITIONAL_JAVA_DIR:=$(framework_docs_LOCAL_ADDITIONAL_JAVA_DIR)

LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES)

# specify a second html input dir and an output path relative to OUT_DIR)

LOCAL_ADDITIONAL_HTML_DIR:=docs/html-intl/intl /

LOCAL_ADDITIONAL_HTML_DIR:=docs/html-intl /

LOCAL_MODULE := ds

LOCAL_DROIDDOC_OPTIONS:= \

		$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \

		-devsite \

		-hdf devsite true \

		-toroot / \

		-hdf android.whichdoc online \

		-hdf devsite true

		$(sample_groups) \

		-useUpdatedTemplates \

		-hdf android.hasSamples true \

		-samplesdir $(samples_dir)

LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk

LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev

include $(BUILD_DROIDDOC)

# ==== docs for the ndk =======================

# ==== site updates for docs (on the androiddevdocs app engine server) =======================

include $(CLEAR_VARS)

LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES)

LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES)

LOCAL_STATIC_JAVA_LIBRARIES:=$(framework_docs_LOCAL_STATIC_JAVA_LIBRARIES)

LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES)

LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS)

LOCAL_DROIDDOC_SOURCE_PATH:=$(framework_docs_LOCAL_DROIDDOC_SOURCE_PATH)

LOCAL_DROIDDOC_HTML_DIR:=docs/html-ndk

LOCAL_DROIDDOC_HTML_DIR:=$(framework_docs_LOCAL_DROIDDOC_HTML_DIR)

LOCAL_ADDITIONAL_JAVA_DIR:=$(framework_docs_LOCAL_ADDITIONAL_JAVA_DIR)

LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES)

# specify a second html input dir and an output path relative to OUT_DIR)

LOCAL_ADDITIONAL_HTML_DIR:=docs/html-intl/intl /

LOCAL_ADDITIONAL_HTML_DIR:=docs/html-intl /

LOCAL_MODULE := online-ndk

LOCAL_MODULE := online-sdk-dev

LOCAL_DROIDDOC_OPTIONS:= \

		$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \

		-toroot / \

		-hdf android.whichdoc online \

		$(sample_groups) \

		-useUpdatedTemplates \

		-hdf android.hasSamples true \

		-samplesdir $(samples_dir)

LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk

LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev

include $(BUILD_DROIDDOC)

# ==== docs that have all of the stuff that's @hidden =======================

include $(CLEAR_VARS)