am bae5cf92: Merge commit \'c9940a2bfe94dbe2ef3bfe5e8692bf4e3cea5ba0\' into HEAD

* commit 'bae5cf92cfa9e2867af91057265df7f029f7865e':
am 047510b1: Merge "gralloc: delete unused mutex declaration"

* commit '047510b132e33c26607b4b93e806884aa4d13f19':
  gralloc: delete unused mutex declaration
am 20ebefd9: Merge commit \'eed5dceb4a0bc02f50f236ab191d30c49c58f610\' into HEAD

* commit '20ebefd966eed9da545ab645199c2f93ca93af20':
am e0c252ae: Merge "hardware: add ro.hardware.<class> to HAL loading properites list"

* commit 'e0c252ae43490cc324b89f6d7cbaa33af8ff341d':
  hardware: add ro.hardware.<class> to HAL loading properites list
am a97c6fec: Merge "hardware: fix check for ro.hardware.<class> property"

* commit 'a97c6fecdbe576b732a2ca00fbf4dcb82f079c8f':
  hardware: fix check for ro.hardware.<class> property
am fa3d243b: Merge "Vibra: Adapt AOSP (default) vibrator HAL into a hardware module."

* commit 'fa3d243b4690f2cc21d259e52178abf969cafc09':
  Vibra: Adapt AOSP (default) vibrator HAL into a hardware module.
am aea8c156: Merge "hardware/libhardware: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"

* commit 'aea8c156649c16347514741eb084858cdb458b75':
  hardware/libhardware: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
usbaudio: fix for out->dev->lock remains locked in error case

out->dev->lock remains locked in error case in out_write()
Added pthread_mutex_unlock() in the error case

Bug: 12824374

Change-Id: Id467e3122008eb8128b42dfc0e9103600c1eef2d
Signed-off-by: Glenn Kasten <gkasten@google.com>
DO NOT MERGE BLE peripheral mode (1/4): change HAL to support service data and service uuids.

Cherry picking ble advertising changes from master to KLP MR2.
b/13137996


Change-Id: I19a3755a4ed16e1ae03368cecee97773c05c1770
am 037335eb: Merge "gralloc: fix warnings"

* commit '037335ebe826289445fd2ba14e95ff41d57ad928':
  gralloc: fix warnings
am 1482406b: usbaudio: fix for out->dev->lock remains locked in error case

* commit '1482406b70a254fc85d153a7066d7f90d724d195':
  usbaudio: fix for out->dev->lock remains locked in error case
am f4c46752: Merge "AArch64: Calculate private_handle_t\'s numInts"

* commit 'f4c46752df57be558773a056d6545877ef65c844':
  AArch64: Calculate private_handle_t's numInts
am f77bd7d0: Merge "Try using goldfish_pipe as the device name"

* commit 'f77bd7d005e27364e233c92ac7f6c06a18d1f128':
  Try using goldfish_pipe as the device name
am 80d4eced: Merge "Use /(vendor|system)/lib64/hw for 64-bit HAL libraries"

* commit '80d4eced69f4d1e9f9ef97b5f4f26868cd76ae26':
  Use /(vendor|system)/lib64/hw for 64-bit HAL libraries
Merge "DO NOT MERGE BLE peripheral mode (1/4): change HAL to support service data and service uuids." into klp-dev
am 56910cf5: Merge "DO NOT MERGE BLE peripheral mode (1/4): change HAL to support service data and service uuids." into klp-dev

* commit '56910cf52332219c6a23bc12596b261c127d93bf':
  DO NOT MERGE BLE peripheral mode (1/4): change HAL to support service data and service uuids.
am b96f1083: Merge "Move libhardware of <asm/page.h>."

* commit 'b96f1083b8d10f3e33b64f0da943dedfdb25b557':
  Move libhardware of <asm/page.h>.
am b342abb6: Merge "gralloc: make private_handle_t layout consistent on 32/64-bit"

* commit 'b342abb6902a698963bb9d2108000da895845985':
  gralloc: make private_handle_t layout consistent on 32/64-bit
am 282ab1b6: Merge "gralloc: dont hardcode 32bpp as RGBX"

* commit '282ab1b6b1a92b8cb2650c111bfab02916f8715d':
  gralloc: dont hardcode 32bpp as RGBX
am 5d082f18: Merge "Fix PAN control callback definition to match what bluedroid is doing."

* commit '5d082f1826cd5b72cd2a0eb0116c8a613d7555dd':
  Fix PAN control callback definition to match what bluedroid is doing.