Commit 9dbf2479 authored Feb 04, 2013 by Scott Main Committed by Android Git Automerger Feb 04, 2013

am 960deffd: am 78bf7c9c: am 1e7e1104: am 4b7161cb: docs: switch devsite doc...

am 960deffd: am 78bf7c9c: am 1e7e1104: am 4b7161cb: docs: switch devsite doc build to use templates-sdk

# Via Android Git Automerger (3) and Scott Main (1)
* commit '960deffd':
  docs: switch devsite doc build to use templates-sdk

parents 0dd75034 960deffd

Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -699,7 +699,7 @@ LOCAL_DROIDDOC_OPTIONS:= \
		-hdf android.whichdoc online \
		-hdf devsite true

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

		include $(BUILD_DROIDDOC)