Merge doc changes from cupcake: commit '5ae517d9659e96e9525406ffbce18dcacc3294bc' into manualmerge (2bfd344b) · Commits · e / os / android_frameworks_base

Android.mk

+2 −1

Original line number	Diff line number	Diff line
		@@ -416,7 +416,8 @@ LOCAL_DROIDDOC_OPTIONS:= \
		$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \
		$(web_docs_sample_code_flags) \
		-toroot / \
		-hdf android.whichdoc online
		-hdf android.whichdoc online \
		-hdf template.showLanguageMenu true

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

+370 −139

File changed.

Preview size limit exceeded, changes collapsed.

0 → 100644

+77.9 KiB

Loading image diff...

0 → 100644

+83.6 KiB

Loading image diff...

0 → 100644

+152 KiB

Loading image diff...