am 73334e60: am 1e4cfe06: am 5df557f6: Merge "logd: logcat: debuggerd: audit logs to events and main"

* commit '73334e60530ac68c8b4686316924c225fd037a84':
  logd: logcat: debuggerd: audit logs to events and main
Remove dmesg_restrict

dmesg_restrict is too coarse of a control. In Android's case,
we want to allow the shell user to see dmesg output, but disallow
others from seeing it.

Rather than rely on dmesg_restrict, use SELinux to control access
to dmesg instead. See corresponding change in external/sepolicy .

Bug: 10020939
Change-Id: I9d4bbbd41cb02b707cdfee79f826a39c1ec2f177
Merge "Add UID and directory for RELRO sharing support."
am 96109cf3: Merge "Add UID and directory for RELRO sharing support."

* commit '96109cf36c3dd44e9ecfe4b810e21e77eaf834dc':
  Add UID and directory for RELRO sharing support.
am a8329a36: am 96109cf3: Merge "Add UID and directory for RELRO sharing support."

* commit 'a8329a36ca0e5f5799ec2dd14ae360dc0656b9c9':
  Add UID and directory for RELRO sharing support.
Merge "Remove dmesg_restrict"
am c290bed0: Merge "Remove dmesg_restrict"

* commit 'c290bed0350cded5620ed8dbb68b1cfb07d9828c':
  Remove dmesg_restrict
am c4ffa5f6: am c290bed0: Merge "Remove dmesg_restrict"

* commit 'c4ffa5f62ef256ff286122d0ceea61364aa67e13':
  Remove dmesg_restrict
am 4f3ad823: am a8329a36: am 96109cf3: Merge "Add UID and directory for RELRO sharing support."

* commit '4f3ad823eaf97fcbcbb1afac67371aff76677b1d':
  Add UID and directory for RELRO sharing support.
am 7206eccb: am c4ffa5f6: am c290bed0: Merge "Remove dmesg_restrict"

* commit '7206eccbd904508a199c7ec302d7395b3b674968':
  Remove dmesg_restrict
Merge "system/window.h: add deprecation warnings"
am 811f2c0b: Merge "system/window.h: add deprecation warnings"

* commit '811f2c0b98d6f8935123221648c96ff975688902':
  system/window.h: add deprecation warnings
am 6445b40e: am 811f2c0b: Merge "system/window.h: add deprecation warnings"

* commit '6445b40e93931dedcb831f38343c031c13b7ddb2':
  system/window.h: add deprecation warnings
am 27348af6: am 6445b40e: am 811f2c0b: Merge "system/window.h: add deprecation warnings"

* commit '27348af683a55d8701567fdeabdd37b547b187f0':
  system/window.h: add deprecation warnings
audio: Add AUDIO_DEVICE_IN_BLUETOOTH_A2DP

Change-Id: I32770abd42702d99f409f0968326041e78d1a826
DO NOT MERGE - audio: added definitions for audio routing extensions

Added definitons and structures for new audio routing features
in the framework and audio HAL.
The structures describe the objects needed to perform audio
routing and audio gain control: different variants of audio ports
and their corresponding configurations as well as gain controllers.

Change-Id: Iecd1b9186831067a52cc55619a63b7bba57dcbd9
Merge "Updated trace.h to recognize ATRACE_TAG_BIONIC."
am bf082ffb: Merge "Updated trace.h to recognize ATRACE_TAG_BIONIC."

* commit 'bf082ffb71c40e4670410b246309a182d9dafcf5':
  Updated trace.h to recognize ATRACE_TAG_BIONIC.
am c752d6dd: am bf082ffb: Merge "Updated trace.h to recognize ATRACE_TAG_BIONIC."

* commit 'c752d6dd37a943b2ef64c184a0ff542e78173bc9':
  Updated trace.h to recognize ATRACE_TAG_BIONIC.
Merge "audio: Add AUDIO_DEVICE_IN_BLUETOOTH_A2DP"