commit 54096df340b52254b8fe873d43f4de76806b788b
author Dirk Dougherty <ddougherty@google.com> Fri Feb 08 16:30:26 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 08 16:30:26 2013 -0800
tree ae1754461675f3a0eb563c8814293635036aa86e
parent ac9504090608247c739a3833cebf91cc21d44483
parent 1f7c3cb3c2b475903c7616bf3f5b06530420cd94

am 1f7c3cb3: am 061c758c: am 9fdf671d: Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.

# Via Android Git Automerger (2) and Dirk Dougherty (1)
* commit '1f7c3cb3c2b475903c7616bf3f5b06530420cd94':
  Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.

core/clear_vars.mk

diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index dd852a1..dc17ecc 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -70,6 +70,7 @@
 LOCAL_DROIDDOC_CUSTOM_ASSET_DIR:=
 LOCAL_DROIDDOC_OPTIONS:=
 LOCAL_DROIDDOC_HTML_DIR:=
+LOCAL_ADDITIONAL_HTML_DIR:=
 LOCAL_ASSET_FILES:=
 LOCAL_ASSET_DIR:=
 LOCAL_RESOURCE_DIR:=