am 17f25410: Merge "Allow shutter/recording sound to be adjusted unless it\'s forced."
am 17f25410: Merge "Allow shutter/recording sound to be adjusted unless it\'s forced."

* commit '17f254105b399c7a4216da2d477e7f9cbdbd7319':
  Allow shutter/recording sound to be adjusted unless it's forced.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base