tree 0cde00e32c05a13c84aca17253c0437bf971e1c5
parent 499e2522455440e7e68c2df8b30a727aa9ef46b3
parent a84e37f37c7cd21fe498a923c181d3896e055d56
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.