tree eece7a7be88d529fd8d251aa09fc2fda8df9ae17
parent 049828caa9dd9733983e1b7bea075f2cea4f7d34
parent e069ec80e964c39229314fa05bd2bc91d4e9e77b
author Eric Laurent <elaurent@google.com> 1349807551 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349807551 -0700

am 350d3b68: Merge "audio policy: deprecate ro.camera.sound.forced" into jb-mr1-dev

* commit '350d3b686357a159fb1a962bbd41e01924d27cad':
  audio policy: deprecate ro.camera.sound.forced