OSDN Git Service

am 4bc873e6: am 7944704e: Merge "Switch camera sounds to always use the system enforc...
authorEino-Ville Talvala <etalvala@google.com>
Fri, 6 Jan 2012 23:51:44 +0000 (15:51 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 6 Jan 2012 23:51:44 +0000 (15:51 -0800)
commit0e5ace70ca8067fc2c3259fe041352d1dab7e1e2
treeda9649b4ca178078ae86b4ef85e6b0c937086949
parent5ff1dd576bb93c45b44088a51544a18fc43ebf58
parentafb3f7fd1a093c333a90cadfe484fe2643e57031
am 4bc873e6: am 7944704e: Merge "Switch camera sounds to always use the system enforced audio stream." into ics-mr1

* commit '4bc873e6ff73200af866f8c9efca66ad8ed23682':
  Switch camera sounds to always use the system enforced audio stream.
services/camera/libcameraservice/CameraService.cpp