Merge commit '3f56d21bf10e0ce866e16112a4ad043c6af1923e' into eclair-plus-aosp * commit '3f56d21bf10e0ce866e16112a4ad043c6af1923e': Fix Issue 2158631: AudioService: volume control sometimes not restored after media server process crash.
Merge commit '3f56d21bf10e0ce866e16112a4ad043c6af1923e' into eclair-plus-aosp * commit '3f56d21bf10e0ce866e16112a4ad043c6af1923e': Fix Issue 2158631: AudioService: volume control sometimes not restored after media server process crash.