am 97c89d4c: am 7257c71f: am 6668404e: Merge "docs: minimize code-font line-height. Fixes problem in which any paragraph with code text has more whitespace below it than other lines." into jb-mr1-dev

# Via Android Git Automerger (2) and others
* commit '97c89d4c5de1bae9d2bbfb040a3ca484d4782540':
  docs: minimize code-font line-height. Fixes problem in which any paragraph with code text has more whitespace below it than other lines.
Merge "Attempt #2: libclcore.bc comes from prebuilts/sdk for unbundled projects."
pdk: fix build error on mac

About symlink, show error on Mac.
To fix it, use 'rm' before 'cp'.

error log:
cp: symlink: /data/misc/audio/wcd9310_anc.bin: File exists
make: *** [out/target/product/mako/system/etc/firmware/wcd9310/wcd9310_anc.bin] Error 1

Bug: 8127112

Change-Id: I94e1677a6742cf4350e92bdffd58e6b782cf662c
Merge "pdk: fix build error on mac"
Add -f option to make for m, mm and mmm

It lets these shell functions work even if you have some
other makefile at the root of your tree.

Change-Id: Ic84688abd89cc70c062e156f1397296837fb137e
am 14e589cf: am 5bd7d418: am 9c3033ce: am dc6b4a59: Add templates for devsite docs builds.

# Via Android Git Automerger (3) and Dirk Dougherty (1)
* commit '14e589cf549d0d2b7bbbe9aa096a9767e4ab6f8d':
  Add templates for devsite docs builds.
am f0b7415e: am 34eb13de: am 18a1a50f: am 9c2336e0: Add new droiddoc option for project-specific secondary html input/output paths.

# Via Android Git Automerger (3) and Dirk Dougherty (1)
* commit 'f0b7415e6e27120b6358445c3c58fef7cc43f28a':
  Add new droiddoc option for project-specific secondary html input/output paths.
am 4ea33de7: am 086e7f8b: am 79935f59: am 015d616a: docs: use devsite hdf bool as a javascript condition for managing the lang toggle. sync the sdk and ds templates so we can move toward one template set

# Via Android Git Automerger (3) and Scott Main (1)
* commit '4ea33de73abc9ba0cf54d4c73775ccff0a526439':
  docs: use devsite hdf bool as a javascript condition for managing the lang toggle. sync the sdk and ds templates so we can move toward one template set
am ee2157bb: am 20ba728e: am 89442344: am e05e6f99: docs: update template files with those from the templates-ds directory

# Via Android Git Automerger (3) and Scott Main (1)
* commit 'ee2157bb0a9bb2c056aaf0e658c7416fd5c1806e':
  docs: update template files with those from the templates-ds directory
am b2a0b57e: am 2baf87e4: am b88c1a8a: am 98f23e7a: docs: delete obsolete asset files

# Via Android Git Automerger (3) and Scott Main (1)
* commit 'b2a0b57e23b32bbaa15892ba229359e430b32d5a':
  docs: delete obsolete asset files
am ae0e037d: am 9bbc247d: am a334cee6: am 77c51357: docs: fix lang switcher for gae by deleting obsolete method call

# Via Android Git Automerger (3) and Scott Main (1)
* commit 'ae0e037d7915ed0a25ffc52e267f0b9ea4428fb5':
  docs: fix lang switcher for gae by deleting obsolete method call
am 70bb7d04: am 97c89d4c: am 7257c71f: am 6668404e: Merge "docs: minimize code-font line-height. Fixes problem in which any paragraph with code text has more whitespace below it than other lines." into jb-mr1-dev

# Via Android Git Automerger (3) and others
* commit '70bb7d04dd7085727a6ea9511abd5dbf8c3579ee':
  docs: minimize code-font line-height. Fixes problem in which any paragraph with code text has more whitespace below it than other lines.
Doc change: remove scss file to fix build.

Change-Id: Ic254acfcee3bdba80e9f63eb77f9621da7136e4c
Merge "Doc change: remove scss file to fix build."
merge in jb-mr2-release history after reset to master
JWQ36
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
JDQ36
Reconcile with jb-mr1.1-release - do not merge

Change-Id: I8c2fd056e6eea6c8d818aa44ced9421f84f64fe5
am c43e8a9c: (-s ours) Reconcile with jb-mr1.1-release - do not merge

# By The Android Automerger
# Via The Android Automerger (11) and The Android Open Source Project (1)
* commit 'c43e8a9cdfce2852d6eaed0d2d0ad8a6205b0f40':
  JDQ36
  JDQ32B
  JDQ32
  JDQ30
  JDQ29C
  JDQ29B
  JDQ29
  JDQ28
  JDQ23
  JDQ18
  JDQ16
  JDQ10
  JDQ09