tree ec9e13131339633dcd8a9785bdf0db7588020d95
parent 22bf648b0b5484834850667664912b660df28585
parent 60a78ac9535878984b0777788760b9ee7465c5e6
author Eino-Ville Talvala <etalvala@google.com> 1325893757 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1325893757 -0800

am 7944704e: Merge "Switch camera sounds to always use the system enforced audio stream." into ics-mr1

* commit '7944704e6c4cc10105838b78d3d8403bf66a066b':
  Switch camera sounds to always use the system enforced audio stream.