am 2e45116d: am 515e0465: Merge "FDO: do not support host modules"

* commit '2e45116d3a9c1ab055dd7a6a93bb4ab79414c081':
  FDO: do not support host modules
am 0a7e26e2: am a3f69c93: Merge "Modify release tools to replace certs in MMAC files."

* commit '0a7e26e29dfb5efbb008ced7509931e5e5eb4d71':
  Modify release tools to replace certs in MMAC files.
am 01c17f03: am e58868ab: Merge "Link PRIVATE_TARGET_FDO_LIB before shared libraries"

* commit '01c17f031286691abeb157cd26ac1785757f07f0':
  Link PRIVATE_TARGET_FDO_LIB before shared libraries
am ad7fd29b: Don\'t bother going through the source tree

* commit 'ad7fd29b312bf588b2be3f799715f34ff8a6d46b':
  Don't bother going through the source tree
am 5e1e791f: am 5aac97cb: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge

* commit '5e1e791f3aaf6661ff4a21fe5b00f264057e862d':
  "JLS36B"
  JWR66X
  JSS15P
am 4c3a82fa: am 2863fa7a: Merge "FDO: support linux-x86 target"

* commit '4c3a82fa62f8bfd4b0553cbd21b439ff2502d639':
  FDO: support linux-x86 target
am 285045bd: Support for LOCAL_HAL_STATIC_LIBRARIES

* commit '285045bd83548196aa3695423c6cd500ebe6d6c1':
  Support for LOCAL_HAL_STATIC_LIBRARIES
am a4ad06ac: am 750e0c08: Merge "Prepare upcoming GCC 4.8 release."

* commit 'a4ad06ac1db1dfc041fe386b76b22233fdc54341':
  Prepare upcoming GCC 4.8 release.
am 883b1c4e: Merge "The big switch.  Enabling InCallUi/Phone split by default." into klp-dev

* commit '883b1c4ee2ea71e542c8ab54aecc094806529304':
  The big switch.  Enabling InCallUi/Phone split by default.
am 405dac7f: am 8f01a3c0: Merge "Add missing LOCAL_ADDITIONAL_DEPENDENCIES dependency to BUILD_PREBUILT."

* commit '405dac7f000af3a02b374533f76a7f2eaedbc954':
  Add missing LOCAL_ADDITIONAL_DEPENDENCIES dependency to BUILD_PREBUILT.
am 66956dc0: am 396fd67d: am b9eee184: am e391e7a8: Remove -allowaccessmodification from the basic Proguard flags

* commit '66956dc063351f30434da9b6bb62183b50996583':
  Remove -allowaccessmodification from the basic Proguard flags
am f8fab173: am fb2188d1: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'f8fab17322ebc221fb493331c3a93b2d852704ae':
  "JWR66Y"
am 477b12b4: Fix missing camera from aosp builds.

* commit '477b12b45ad0c8e73aafe12e3056c051080c0de9':
  Fix missing camera from aosp builds.
Reconcile with klp-release - do not merge

Change-Id: Ic55943955deea3d844a22c766f3a389e6793925a
am 3208b615: am fc8b6338: resolved conflicts for merge of d65a7da3 to jb-mr2-dev-plus-aosp

* commit '3208b615c5cde2b682c3bbbcd2bb064b14b57489':
  No need to filter out AndroidConfig.h for unbundled build
am 6f03bd60: am ce478d54: am 7e453280: am 52dd2067: fix two bugs in site script. 1. Fix URL path check for reference docs to initalize api level and sidenav. Previously, this condition was never true, so the sidenav would not be initialized under default conditions an

* commit '6f03bd6092cba47d073e8bdc131d1cba89fa6c7c':
  fix two bugs in site script. 1. Fix URL path check for reference docs to initalize api level and sidenav. Previously, this condition was never true, so the sidenav would not be initialized under default conditions and the reference drag bar would not appear. 2. Fix the recent change to the 'scroll into view' script so that it works properly in a multi-pane sidenav (reference docs) by again making the offset measurement relative to the parent container (but much better than was done before).
am a7deb085: Add phony goal GET-INSTALL-PATH

* commit 'a7deb0857c4fc0799cd1ebb82ff79dcbe2745ec0':
  Add phony goal GET-INSTALL-PATH
am 2d028379: am 6d244fb2: am d5ac8330: am 4f7e5159: doc change: Samples browsing: basic support in templates and js/css.

* commit '2d0283792d1fd2fcb4f1dcdc4b34e40515f7393c':
  doc change: Samples browsing: basic support in templates and js/css.
am fa67740a: am 25977365: Merge "mkbootimg: Support custom mkbootimg implementation"

* commit 'fa67740ae41fc068d9a9b5fbf5a7a06c36dbbdb1':
  mkbootimg: Support custom mkbootimg implementation
am b9fe2d2c: am 337ebc19: am 62c755a5: am f5ffd4a4: Clean up core css changes brought in with samples css.

* commit 'b9fe2d2c93ae9734d174f07427ebb3d17b7b346c':
  Clean up core css changes brought in with samples css.