tree ffdf68c388135cf4d66d606fdb36f45f9b92f716
parent 1c8e0a074be475e653a7263688bd818120d17a45
parent 1b6989cdc212aec7579489a362f99b791abe7352
author Mike Lockwood <lockwood@google.com> 1332454563 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1332454563 -0700

Merge changes I35a76a27,I04bb7ad4,If38a1a10,Ice5be6e5,I009e443f,I968ddf90,I69d4e518,I09b1dfc9

* changes:
  Merge commit '74803dc'
  add config_bluetooth_default_profiles config var and use it to disable bt profiles
  Do not allow Surface creation on machines without SurfaceFlinger We will fail later anyways, but this change makes it much easier to track down places where we are inadvertently doing operations that depend on the flinger.
  fix setting only usb mode
  Detect (at runtime) kernel support for the "hdmi_audio" switch.
  Add a config resource to disable key-chord screenshotting
  Do not assume that there is always a running activity (Necessary for headless devices)
  Add batch volume adjust support to adjustMasterVolume() in AudioManager and AudioService.