tree ae1754461675f3a0eb563c8814293635036aa86e
parent ac9504090608247c739a3833cebf91cc21d44483
parent 1f7c3cb3c2b475903c7616bf3f5b06530420cd94
author Dirk Dougherty <ddougherty@google.com> 1360369826 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360369826 -0800

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.