commit 9d38ec786de822d5c5b9e5c6ff617e5631c7e46e
author Dirk Dougherty <ddougherty@google.com> Fri Feb 08 16:33:09 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 08 16:33:09 2013 -0800
tree b0f89c4ee7e2edca4449fe5f267a6ab542372339
parent 3de5c8e785254edea2fe8aa5e6b1f68505795b8f
parent 54096df340b52254b8fe873d43f4de76806b788b

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

# Via Android Git Automerger (3) and Dirk Dougherty (1)
* commit '54096df340b52254b8fe873d43f4de76806b788b':
  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 3c2a505..71ac963 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -71,6 +71,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:=