tree 8de446341394ffb7368802e27c0c0d840d8e8229
parent 039594c9d04f1890a6965d2e927f13822b526e68
parent 14d1c00b9c3c09b0c88c888f9f05da47eee95e5e
author Chih-Chung Chang <chihchung@google.com> 1318905734 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1318905734 -0700

am a84e37f3: Merge "Fix 5468644: Use the proper audio stream type to play sound." into ics-mr0

* commit 'a84e37f37c7cd21fe498a923c181d3896e055d56':
  Fix 5468644: Use the proper audio stream type to play sound.