am 93fd0f7a: Merge into jb-mr1-dev
am 93fd0f7a: Merge into jb-mr1-dev

* commit '93fd0f7a83f61d4d673b73e002bd9ad7d6ce562b':
  Camera: Improve enableShutterSound documentation.

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